From: "zhangjian (CG)" <zhangjian496@huawei.com>
To: <chuck.lever@oracle.com>, Jeff Layton <jlayton@kernel.org>,
<neil@brown.name>, <okorniev@redhat.com>, <Dai.Ngo@oracle.com>
Cc: <linux-nfs@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: sunrpc:fix shift-out-of-bounds for majortimeo
Date: Fri, 12 Jun 2026 11:03:56 +0800 [thread overview]
Message-ID: <39030635-e879-4cca-adfc-b6e94d2ec3ab@huawei.com> (raw)
For UDP proto, to->to_exponential is true. Too large to_retries
may cause shift-out-of-bounds error for "majortime <<= to_retries"
Add sanity checks to fix it.
Signed-off-by: zhangjian <zhangjian496@huawei.com>
---
net/sunrpc/xprt.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 48a3618cbb29..c62f9998ffe9 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -656,10 +656,16 @@ static unsigned long xprt_calc_majortimeo(struct
rpc_rqst *req,
{
unsigned long majortimeo = req->rq_timeout;
- if (to->to_exponential)
- majortimeo <<= to->to_retries;
- else
+ if (to->to_exponential) {
+ if (to->to_retries >= BITS_PER_LONG ||
+ majortimeo > (ULONG_MAX >> to->to_retries)) {
+ majortimeo = ULONG_MAX;
+ } else {
+ majortimeo <<= to->to_retries;
+ }
+ } else {
majortimeo += to->to_increment * to->to_retries;
+ }
if (majortimeo > to->to_maxval || majortimeo == 0)
majortimeo = to->to_maxval;
return majortimeo;
--
2.33.0
reply other threads:[~2026-06-12 3:04 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=39030635-e879-4cca-adfc-b6e94d2ec3ab@huawei.com \
--to=zhangjian496@huawei.com \
--cc=Dai.Ngo@oracle.com \
--cc=chuck.lever@oracle.com \
--cc=jlayton@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neil@brown.name \
--cc=okorniev@redhat.com \
/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®