aboutsummaryrefslogtreecommitdiffstats
path: root/net/rds/send.c
diff options
context:
space:
mode:
authorLinus Walleij <[email protected]>2015-12-21 08:36:21 +0000
committerLinus Walleij <[email protected]>2015-12-21 08:36:21 +0000
commit0529357f102b96f68bc199f858d1c3b07f4b674c (patch)
treeeaa047952a768099e00a5245afa0d84799df6990 /net/rds/send.c
parentgpio: pch: fix non-DT build (diff)
parentLinux 4.4-rc6 (diff)
downloadkernel-0529357f102b96f68bc199f858d1c3b07f4b674c.tar.gz
kernel-0529357f102b96f68bc199f858d1c3b07f4b674c.zip
Merge tag 'v4.4-rc6' into devel
Linux 4.4-rc6
Diffstat (limited to 'net/rds/send.c')
-rw-r--r--net/rds/send.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rds/send.c b/net/rds/send.c
index 827155c2ead1..c9cdb358ea88 100644
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -1013,11 +1013,13 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
release_sock(sk);
}
- /* racing with another thread binding seems ok here */
+ lock_sock(sk);
if (daddr == 0 || rs->rs_bound_addr == 0) {
+ release_sock(sk);
ret = -ENOTCONN; /* XXX not a great errno */
goto out;
}
+ release_sock(sk);
if (payload_len > rds_sk_sndbuf(rs)) {
ret = -EMSGSIZE;