Skip to content

firmware_loader: prevent integer overflow in firmware_loading_timeout() #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: driver-core-next_base
Choose a base branch
from
Open

firmware_loader: prevent integer overflow in firmware_loading_timeout() #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions drivers/base/firmware_loader/fallback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ void fw_fallback_set_default_timeout(void)

static long firmware_loading_timeout(void)
{
return __firmware_loading_timeout() > 0 ?
__firmware_loading_timeout() * HZ : MAX_JIFFY_OFFSET;
long timeout;

if (__firmware_loading_timeout() <= 0)
return MAX_JIFFY_OFFSET;
if (check_mul_overflow(__firmware_loading_timeout(), HZ, &timeout))
return LONG_MAX;
return timeout;
}

static inline int fw_sysfs_wait_timeout(struct fw_priv *fw_priv, long timeout)
Expand Down