]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
NET: llc, zero sockaddr_llc struct
authorJiri Slaby <jirislaby@gmail.com>
Mon, 24 Aug 2009 05:55:51 +0000 (22:55 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Sep 2009 03:17:41 +0000 (20:17 -0700)
commit 28e9fc592cb8c7a43e4d3147b38be6032a0e81bc upstream.

sllc_arphrd member of sockaddr_llc might not be changed. Zero sllc
before copying to the above layer's structure.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/llc/af_llc.c

index 5bcc452a247fb54338dc1fac77563df7d6c49f4a..90a55b1a66c2010c8d3b2de8215275ab757f7d77 100644 (file)
@@ -915,6 +915,7 @@ static int llc_ui_getname(struct socket *sock, struct sockaddr *uaddr,
        struct llc_sock *llc = llc_sk(sk);
        int rc = 0;
 
+       memset(&sllc, 0, sizeof(sllc));
        lock_sock(sk);
        if (sock_flag(sk, SOCK_ZAPPED))
                goto out;