Commit f7e603ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 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
parents cac71121 50fee1de

net/core/net_namespace.c

+4 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ static __net_init int setup_net(struct net *net) 
	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

+1 −1
Original line number Diff line number Diff line
@@ -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: