diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/sock.c | 2 | ||||
| -rw-r--r-- | net/unix/af_unix.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 6565431b0e6..50a345e5a26 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -885,7 +885,7 @@ set_rcvbuf: case SO_PEEK_OFF: if (sock->ops->set_peek_off) - sock->ops->set_peek_off(sk, val); + ret = sock->ops->set_peek_off(sk, val); else ret = -EOPNOTSUPP; break; diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 8664ad0d579..2ee993c7732 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -529,13 +529,17 @@ static int unix_seqpacket_sendmsg(struct kiocb *, struct socket *, static int unix_seqpacket_recvmsg(struct kiocb *, struct socket *, struct msghdr *, size_t, int); -static void unix_set_peek_off(struct sock *sk, int val) +static int unix_set_peek_off(struct sock *sk, int val) { struct unix_sock *u = unix_sk(sk); - mutex_lock(&u->readlock); + if (mutex_lock_interruptible(&u->readlock)) + return -EINTR; + sk->sk_peek_off = val; mutex_unlock(&u->readlock); + + return 0; } |