Commit 9b6e27d0 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd: don't alloc under spinlock in rpc_parse_scope_id 



Dan Carpenter says:

  The patch d20c11d8: "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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: d20c11d8 ("nfsd: Protect session creation and client...")
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent e4e737bb

net/sunrpc/addr.c

+18 −22
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ static int rpc_parse_scope_id(struct net *net, const char *buf, 
			      const size_t buflen, const char *delim,

			      struct sockaddr_in6 *sin6)

{

	char *p;

	char p[IPV6_SCOPE_ID_LEN + 1];

	size_t len;

	u32 scope_id = 0;

	struct net_device *dev;



	if ((buf + buflen) == delim)

		return 1;
@@ -175,31 +177,25 @@ static int rpc_parse_scope_id(struct net *net, const char *buf, 
		return 0;



	len = (buf + buflen) - delim - 1;

	p = kmemdup_nul(delim + 1, len, GFP_KERNEL);

	if (p) {

		u32 scope_id = 0;

		struct net_device *dev;

	if (len > IPV6_SCOPE_ID_LEN)

		return 0;



	memcpy(p, delim + 1, len);

	p[len] = 0;



	dev = dev_get_by_name(net, p);

	if (dev != NULL) {

		scope_id = dev->ifindex;

		dev_put(dev);

	} else {

			if (kstrtou32(p, 10, &scope_id) != 0) {

				kfree(p);

		if (kstrtou32(p, 10, &scope_id) != 0)

			return 0;

	}

		}



		kfree(p);



	sin6->sin6_scope_id = scope_id;

	return 1;

}



	return 0;

}



static size_t rpc_pton6(struct net *net, const char *buf, const size_t buflen,

			struct sockaddr *sap, const size_t salen)

{