sunrpc: Prevent resvport min/max inversion via sysfs and module parameter

fsorenson · trondmypd · commit ffb6ca33b04b · 2016-07-19T16:23:27.000-04:00
The current min/max resvport settings are independently limited
by the entire range of allowed ports, so max_resvport can be
set to a port lower than min_resvport.

Prevent inversion of min/max values when set through sysfs and
module parameter by setting the limits dependent on each other.

Signed-off-by: Frank Sorenson &lt;sorenson@redhat.com&gt;
Signed-off-by: Trond Myklebust &lt;trond.myklebust@primarydata.com&gt;
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
@@ -3153,8 +3153,12 @@ static int param_set_uint_minmax(const char *val,
 
 static int param_set_portnr(const char *val, const struct kernel_param *kp)
 {
-	return param_set_uint_minmax(val, kp,
+	if (kp->arg == &xprt_min_resvport)
+		return param_set_uint_minmax(val, kp,
 			RPC_MIN_RESVPORT,
+			xprt_max_resvport);
+	return param_set_uint_minmax(val, kp,
+			xprt_min_resvport,
 			RPC_MAX_RESVPORT);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3153,8 +3153,12 @@ static int param_set_uint_minmax(const char *val,`
`3153`	`3153`
`3154`	`3154`	`static int param_set_portnr(const char val, const struct kernel_param kp)`
`3155`	`3155`	`{`
`3156`		`- return param_set_uint_minmax(val, kp,`
	`3156`	`+ if (kp->arg == &xprt_min_resvport)`
	`3157`	`+ return param_set_uint_minmax(val, kp,`
`3157`	`3158`	`RPC_MIN_RESVPORT,`
	`3159`	`+ xprt_max_resvport);`
	`3160`	`+ return param_set_uint_minmax(val, kp,`
	`3161`	`+ xprt_min_resvport,`
`3158`	`3162`	`RPC_MAX_RESVPORT);`
`3159`	`3163`	`}`
`3160`	`3164`