Commit 5189dafa authored by Linus Torvalds's avatar Linus Torvalds

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

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
parents 7299cd48 91da337e
...@@ -2069,8 +2069,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info) ...@@ -2069,8 +2069,7 @@ int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info)
continue; continue;
} }
ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa, ret = svc_xprt_create_from_sa(serv, xcl_name, net, sa, 0,
SVC_SOCK_ANONYMOUS,
get_current_cred()); get_current_cred());
/* always save the latest error */ /* always save the latest error */
if (ret < 0) if (ret < 0)
......
...@@ -161,7 +161,7 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp) ...@@ -161,7 +161,7 @@ param_get_pool_mode(char *buf, const struct kernel_param *kp)
str[len] = '\n'; str[len] = '\n';
str[len + 1] = '\0'; 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, module_param_call(pool_mode, param_set_pool_mode, param_get_pool_mode,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment