From: Sergey Shtylyov <s.shtylyov@omp.ru>
To: Luis Chamberlain <mcgrof@kernel.org>,
Russ Weight <russ.weight@linux.dev>,
Danilo Krummrich <dakr@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH] firmware_loader: prevent integer overflow in firmware_loading_timeout()
Date: Thu, 3 Jul 2025 23:38:33 +0300 [thread overview]
Message-ID: <62c63afc-5d56-46fc-aac4-87081498602d@omp.ru> (raw)
In firmware_loading_timeout(), *int* result of __firmware_loading_timeout()
multiplied by HZ might overflow before being implicitly cast to *long* when
being returned. Rewrite the function using check_mul_overflow() and capping
the result at LONG_MAX on actual overflow...
Found by Linux Verification Center (linuxtesting.org) with the Svace static
analysis tool.
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Cc: stable@vger.kernel.org
---
The patch is against the commit 78f4e737a53e1163ded2687a922fce138aee73f5 in
Linus Torvalds' linux.git repo -- that's the most recent commit I could get
(git {fetch,pull} from git.kernel stopped working for me first with git://
and then with https:// protocol)...
drivers/base/firmware_loader/fallback.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
Index: linux/drivers/base/firmware_loader/fallback.c
===================================================================
--- linux.orig/drivers/base/firmware_loader/fallback.c
+++ linux/drivers/base/firmware_loader/fallback.c
@@ -35,8 +35,13 @@ void fw_fallback_set_default_timeout(voi
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)
next reply other threads:[~2025-07-03 20:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-03 20:38 Sergey Shtylyov [this message]
2025-07-05 1:39 ` Luis Chamberlain
2025-07-25 19:50 ` Sergey Shtylyov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62c63afc-5d56-46fc-aac4-87081498602d@omp.ru \
--to=s.shtylyov@omp.ru \
--cc=dakr@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=rafael@kernel.org \
--cc=russ.weight@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®