From f3c75c86738bfcf5f013721f2b492436f5681d92 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 12 Sep 2007 13:58:02 +0200
Subject: [PATCH] --- yaml --- r: 66393 b: refs/heads/master c:
 c48dad7ecd84eac92afbe02bd69fca9983a65a56 h: refs/heads/master i:   66391:
 0d67b57a9a2a4b2236928320df707f2f15ad7aea v: v3

---
 [refs]                           | 2 +-
 trunk/net/netfilter/nf_sockopt.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 356562141a00..cc7a5debeaa0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8a5ec672768c3cf4d51d7a63fc071520afa1617
+refs/heads/master: c48dad7ecd84eac92afbe02bd69fca9983a65a56
diff --git a/trunk/net/netfilter/nf_sockopt.c b/trunk/net/netfilter/nf_sockopt.c
index e32761ce260c..aa2831587b82 100644
--- a/trunk/net/netfilter/nf_sockopt.c
+++ b/trunk/net/netfilter/nf_sockopt.c
@@ -69,6 +69,9 @@ static int nf_sockopt(struct sock *sk, int pf, int val,
 	struct nf_sockopt_ops *ops;
 	int ret;
 
+	if (sk->sk_net != &init_net)
+		return -ENOPROTOOPT;
+
 	if (mutex_lock_interruptible(&nf_sockopt_mutex) != 0)
 		return -EINTR;
 
@@ -125,6 +128,10 @@ static int compat_nf_sockopt(struct sock *sk, int pf, int val,
 	struct nf_sockopt_ops *ops;
 	int ret;
 
+	if (sk->sk_net != &init_net)
+		return -ENOPROTOOPT;
+
+
 	if (mutex_lock_interruptible(&nf_sockopt_mutex) != 0)
 		return -EINTR;