SUNRPC: xprt: prevent shift-out-of-bounds
Subsystems (3)
PATCH 1/1 SUNRPC: xprt: prevent shift-out-of-bounds
Prevent a UBSAN shift-out-of-bounds warning:
UBSAN: shift-out-of-bounds in net/sunrpc/xprt.c:658:14
shift exponent 536871232 is too large for 64-bit type 'long unsigned int'
If to_exponential is true and to_retries is >= BITS_PER_LONG, this will cause an invalid shift value when calculating the new majortimeo value.
In this case, when to_retries >= BITS_PER_LONG, cap (new local) retry at BITS_PER_LONG - 1 and continue.
Fixes da953063bdce ("SUNRPC: Start the first major timeout calculation at task creation")
Signed-off-by Randy Dunlap <[email protected]>
Reported-by [email protected]
Cc "J. Bruce Fields" <[email protected]>
Cc Chuck Lever <[email protected]>
Cc Trond Myklebust <[email protected]>
Cc Anna Schumaker <[email protected]>
---
a shortcut if desired: (also drop local 'retry' & change it back to
'to->to_retries') if (to->to_retries >= BITS_PER_LONG) goto set_maxval;
...set_maxval:
majortimeo = to->to_maxval;
net/sunrpc/xprt.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
net/sunrpc/xprt.c +9 -3
@@ -41,6 +41,7 @@#include <linux/module.h> #include <linux/types.h> +#include <linux/bits.h> #include <linux/interrupt.h> #include <linux/workqueue.h> #include <linux/net.h>
@@ -593,10 +594,15 @@ static unsigned long xprt_calc_majortimeconst struct rpc_timeout *to = req->rq_task->tk_client->cl_timeout;unsigned long majortimeo = req->rq_timeout; -if (to->to_exponential) - majortimeo <<= to->to_retries; -else +if (to->to_exponential) { +unsigned int retry = to->to_retries; + +if (retry >=BITS_PER_LONG ) + retry =BITS_PER_LONG -1 ; + majortimeo <<= retry; + }else { majortimeo += to->to_increment * to->to_retries; + }if (majortimeo > to->to_maxval || majortimeo ==0 ) majortimeo = to->to_maxval;return majortimeo;