diff options
Diffstat (limited to 'net/ipv6/ipv6_sockglue.c')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 10 | 
1 files changed, 2 insertions, 8 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index d78d41fc4b1a..24535169663d 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -1367,10 +1367,7 @@ int ipv6_getsockopt(struct sock *sk, int level, int optname,  		if (get_user(len, optlen))  			return -EFAULT; -		lock_sock(sk); -		err = nf_getsockopt(sk, PF_INET6, optname, optval, -				&len); -		release_sock(sk); +		err = nf_getsockopt(sk, PF_INET6, optname, optval, &len);  		if (err >= 0)  			err = put_user(len, optlen);  	} @@ -1409,10 +1406,7 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,  		if (get_user(len, optlen))  			return -EFAULT; -		lock_sock(sk); -		err = compat_nf_getsockopt(sk, PF_INET6, -					   optname, optval, &len); -		release_sock(sk); +		err = compat_nf_getsockopt(sk, PF_INET6, optname, optval, &len);  		if (err >= 0)  			err = put_user(len, optlen);  	}  |