diff options
Diffstat (limited to 'net/unix/af_unix.c')
| -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)  {  	struct unix_sock *u = unix_sk(sk); -	msg->msg_namelen = 0;  	if (u->addr) {  		msg->msg_namelen = u->addr->len;  		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,  	if (flags&MSG_OOB)  		goto out; -	msg->msg_namelen = 0; -  	err = mutex_lock_interruptible(&u->readlock);  	if (err) {  		err = sock_intr_errno(sock_rcvtimeo(sk, noblock)); @@ -1924,8 +1921,6 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,  	target = sock_rcvlowat(sk, flags&MSG_WAITALL, size);  	timeo = sock_rcvtimeo(sk, flags&MSG_DONTWAIT); -	msg->msg_namelen = 0; -  	/* Lock the socket to prevent queue disordering  	 * while sleeps in memcpy_tomsg  	 */ | 
