Merge tag 'nfsd-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

torvalds · torvalds · commit 5189dafa4cf9 · 2024-08-10T10:44:21.000-07:00
Pull nfsd fixes from Chuck Lever:

 - Two minor fixes for recent changes

* tag 'nfsd-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: don't set SVC_SOCK_ANONYMOUS when creating nfsd sockets
  sunrpc: avoid -Wformat-security warning
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
@@ -2069,8 +2069,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info)
 			continue;
 		}
 
-		ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa,
-					      SVC_SOCK_ANONYMOUS,
+		ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa, 0,
 					      get_current_cred());
 		/* always save the latest error */
 		if (ret < 0)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
@@ -161,7 +161,7 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp)
 	str[len] = '\n';
 	str[len + 1] = '\0';
 
-	return sysfs_emit(buf, str);
+	return sysfs_emit(buf, "%s", str);
 }
 
 module_param_call(pool_mode, param_set_pool_mode, param_get_pool_mode,

Original file line number	Diff line number	Diff line change
`@@ -2069,8 +2069,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff skb, struct genl_info info)`
`2069`	`2069`	`continue;`
`2070`	`2070`	`}`
`2071`	`2071`
`2072`		`- ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa,`
`2073`		`- SVC_SOCK_ANONYMOUS,`
	`2072`	`+ ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa, 0,`
`2074`	`2073`	`get_current_cred());`
`2075`	`2074`	`/* always save the latest error */`
`2076`	`2075`	`if (ret < 0)`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ param_get_pool_mode(char buf, const struct kernel_param kp)`
`161`	`161`	`str[len] = '\n';`
`162`	`162`	`str[len + 1] = '\0';`
`163`	`163`
`164`		`- return sysfs_emit(buf, str);`
	`164`	`+ return sysfs_emit(buf, "%s", str);`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`module_param_call(pool_mode, param_set_pool_mode, param_get_pool_mode,`