Skip to contentSkip to conversation

sunrpc:fix shift-out-of-bounds for majortimeo

PATCH zhangjian (CG) 1 participant 1 message Jun 12

Subsystems (3)
lore
Share & tools
lore
#0 lore 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.

---
 net/sunrpc/xprt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
net/sunrpc/xprt.c +0 -0
index 48a3618cbb29..c62f9998ffe9 100644
@@ -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;

Signature · 1 line
2.33.0