Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

f7e603ad · Linus Torvalds <[email protected]> · 2009-02-23 20:29:21 -08:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: amend the fix for SO_BSDCOMPAT gsopt infoleak
  netns: build fix for net_alloc_generic

Commit: f7e603ad8f78cd3b59e33fa72707da0cbabdf699
Parents: cac71121 · 50fee1de

Merge commit. Changes below are compared with the first parent: cac71121.

Changes

2 files changed · +5 −5

File	Status	Add	Del	Content
net/core/net_namespace.c	modified	+4	−4	View file
net/core/sock.c	modified	+1	−1	View file

net/core/net_namespace.c

View file

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index b0767ab..2adb1a7 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -63,10 +63,6 @@ out_undo:
 	goto out;
 }
 
-#ifdef CONFIG_NET_NS
-static struct kmem_cache *net_cachep;
-static struct workqueue_struct *netns_wq;
-
 static struct net_generic *net_alloc_generic(void)
 {
 	struct net_generic *ng;
@@ -80,6 +76,10 @@ static struct net_generic *net_alloc_generic(void)
 	return ng;
 }
 
+#ifdef CONFIG_NET_NS
+static struct kmem_cache *net_cachep;
+static struct workqueue_struct *netns_wq;
+
 static struct net *net_alloc(void)
 {
 	struct net *net = NULL;

net/core/sock.c

View file

diff --git a/net/core/sock.c b/net/core/sock.c
index 6e4f14d..5f97caa 100644
--- a/net/core/sock.c
+++ b/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: