---

yaml --- r: 322019 b: refs/heads/master c: 3592aae h: refs/heads/master i: 322017: 2c07bfc 322015: 762fadc v: v3
git-mirror · Aug 16, 2012 · cf2a009 · cf2a009
1 parent 90c6752
commit cf2a009
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04d4fbca1017c11381e7d82acea21dd741e748bc
+refs/heads/master: 3592aaeb80290bda0f2cf0b5456c97bfc638b192
diff --git a/trunk/net/llc/af_llc.c b/trunk/net/llc/af_llc.c
@@ -969,14 +969,13 @@ static int llc_ui_getname(struct socket *sock, struct sockaddr *uaddr,
 	struct sockaddr_llc sllc;
 	struct sock *sk = sock->sk;
 	struct llc_sock *llc = llc_sk(sk);
-	int rc = 0;
+	int rc = -EBADF;
 
 	memset(&sllc, 0, sizeof(sllc));
 	lock_sock(sk);
 	if (sock_flag(sk, SOCK_ZAPPED))
 		goto out;
 	*uaddrlen = sizeof(sllc);
-	memset(uaddr, 0, *uaddrlen);
 	if (peer) {
 		rc = -ENOTCONN;
 		if (sk->sk_state != TCP_ESTABLISHED)