UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: don't alloc under spinlock in rpc_parse_scope_id 

Dan Carpenter says:

  The patch d20c11d86d8f: "nfsd: Protect session creation and client
  confirm using client_lock" from Jul 30, 2014, leads to the following
  Smatch static checker warning:

        net/sunrpc/addr.c:178 rpc_parse_scope_id()
        warn: sleeping in atomic context

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: d20c11d86d ("nfsd: Protect session creation and client...")
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
J. Bruce Fields 2021-09-14 12:30:32 -04:00
parent e4e737bb5c
commit 9b6e27d01a
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/sunrpc/addr.c
View File

@ -162,8 +162,10 @@ static int rpc_parse_scope_id(struct net *net, const char *buf,
const size_t buflen, const char *delim, const size_t buflen, const char *delim,
struct sockaddr_in6 *sin6) struct sockaddr_in6 *sin6)
{ {
char *p; char p[IPV6_SCOPE_ID_LEN + 1];
size_t len; size_t len;
u32 scope_id = 0;
struct net_device *dev;
if ((buf + buflen) == delim) if ((buf + buflen) == delim)
return 1; return 1;
@ -175,29 +177,23 @@ static int rpc_parse_scope_id(struct net *net, const char *buf,
return 0; return 0;
len = (buf + buflen) - delim - 1; len = (buf + buflen) - delim - 1;
p = kmemdup_nul(delim + 1, len, GFP_KERNEL); if (len > IPV6_SCOPE_ID_LEN)
if (p) { return 0;
u32 scope_id = 0;
struct net_device *dev;
dev = dev_get_by_name(net, p); memcpy(p, delim + 1, len);
if (dev != NULL) { p[len] = 0;
scope_id = dev->ifindex;
dev_put(dev);
} else {
if (kstrtou32(p, 10, &scope_id) != 0) {
kfree(p);
return 0;
}
}
kfree(p); dev = dev_get_by_name(net, p);
if (dev != NULL) {
sin6->sin6_scope_id = scope_id; scope_id = dev->ifindex;
return 1; dev_put(dev);
} else {
if (kstrtou32(p, 10, &scope_id) != 0)
return 0;
} }
return 0; sin6->sin6_scope_id = scope_id;
return 1;
} }
static size_t rpc_pton6(struct net *net, const char *buf, const size_t buflen, static size_t rpc_pton6(struct net *net, const char *buf, const size_t buflen,