diff --git a/[refs] b/[refs] index 143a4c9640e3..11fe35bb5c47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b860d3cc62877fad02863e2a08efff69a19382d2 +refs/heads/master: c77a4b9cffb6215a15196ec499490d116dfad181 diff --git a/trunk/net/llc/af_llc.c b/trunk/net/llc/af_llc.c index 88709882c464..48aaa89253e0 100644 --- a/trunk/net/llc/af_llc.c +++ b/trunk/net/llc/af_llc.c @@ -720,6 +720,8 @@ static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, int target; /* Read at least this many bytes */ long timeo; + msg->msg_namelen = 0; + lock_sock(sk); copied = -ENOTCONN; if (unlikely(sk->sk_type == SOCK_STREAM && sk->sk_state == TCP_LISTEN))