diff options
Diffstat (limited to 'net/unix')
-rw-r--r-- | net/unix/af_unix.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index c1f403bed683..01625ccc3ae6 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -1754,7 +1754,6 @@ static void unix_copy_addr(struct msghdr *msg, struct sock *sk) | |||
1754 | { | 1754 | { |
1755 | struct unix_sock *u = unix_sk(sk); | 1755 | struct unix_sock *u = unix_sk(sk); |
1756 | 1756 | ||
1757 | msg->msg_namelen = 0; | ||
1758 | if (u->addr) { | 1757 | if (u->addr) { |
1759 | msg->msg_namelen = u->addr->len; | 1758 | msg->msg_namelen = u->addr->len; |
1760 | memcpy(msg->msg_name, u->addr->name, u->addr->len); | 1759 | memcpy(msg->msg_name, u->addr->name, u->addr->len); |
@@ -1778,8 +1777,6 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1778 | if (flags&MSG_OOB) | 1777 | if (flags&MSG_OOB) |
1779 | goto out; | 1778 | goto out; |
1780 | 1779 | ||
1781 | msg->msg_namelen = 0; | ||
1782 | |||
1783 | err = mutex_lock_interruptible(&u->readlock); | 1780 | err = mutex_lock_interruptible(&u->readlock); |
1784 | if (err) { | 1781 | if (err) { |
1785 | err = sock_intr_errno(sock_rcvtimeo(sk, noblock)); | 1782 | err = sock_intr_errno(sock_rcvtimeo(sk, noblock)); |
@@ -1924,8 +1921,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1924 | target = sock_rcvlowat(sk, flags&MSG_WAITALL, size); | 1921 | target = sock_rcvlowat(sk, flags&MSG_WAITALL, size); |
1925 | timeo = sock_rcvtimeo(sk, flags&MSG_DONTWAIT); | 1922 | timeo = sock_rcvtimeo(sk, flags&MSG_DONTWAIT); |
1926 | 1923 | ||
1927 | msg->msg_namelen = 0; | ||
1928 | |||
1929 | /* Lock the socket to prevent queue disordering | 1924 | /* Lock the socket to prevent queue disordering |
1930 | * while sleeps in memcpy_tomsg | 1925 | * while sleeps in memcpy_tomsg |
1931 | */ | 1926 | */ |