From cf2a009fc677dbd34b0d50742df858d90a5256f5 Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Wed, 15 Aug 2012 11:31:53 +0000 Subject: [PATCH] --- yaml --- r: 322019 b: refs/heads/master c: 3592aaeb80290bda0f2cf0b5456c97bfc638b192 h: refs/heads/master i: 322017: 2c07bfcbd1be5b73e18f7f7a73357fabcd306fe2 322015: 762fadc38d8729fe11634788ca788fbdf19bee12 v: v3 --- [refs] | 2 +- trunk/net/llc/af_llc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9245fb167ffc..36d9e179f0cb 100644 --- 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 index 8c2919ca36f6..c2190005a114 100644 --- 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)