aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-08-23 22:55:51 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-08 20:17:41 -0700
commit42c6afea4b7a0512d2fd7c2b7fc6fa667366e315 (patch)
treec7946fa65dcf7dc82a9aef5d5897d98481fe0f1e /net
parent3b9246e2b55f8aa3c3d9732d0eb7e9943a6f9492 (diff)
NET: llc, zero sockaddr_llc struct
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>
Diffstat (limited to 'net')
-rw-r--r--net/llc/af_llc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 5bcc452a247..90a55b1a66c 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -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;