diff --git a/[refs] b/[refs] index 16050da767ad..eacf6db4afe9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebe47d47b7b7fed72dabcce4717da727b4e2367d +refs/heads/master: 50fee1dec5d71b8a14c1b82f2f42e16adc227f8b diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 6e4f14d1ef81..5f97caa158e8 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -696,7 +696,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname, if (len < 0) return -EINVAL; - v.val = 0; + memset(&v, 0, sizeof(v)); switch(optname) { case SO_DEBUG: