From 553d81c778cace7f46205826183b43bc5d085761 Mon Sep 17 00:00:00 2001
From: Florian Westphal <fwestphal@astaro.com>
Date: Fri, 8 Jan 2010 17:31:24 +0100
Subject: [PATCH] --- yaml --- r: 179121 b: refs/heads/master c:
 dce766af541f6605fa9889892c0280bab31c66ab h: refs/heads/master i:   179119:
 b4df14475db13cf3bb43b616d35ebdaf0cd6f5c1 v: v3

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

diff --git a/[refs] b/[refs]
index 9068b1d4b2b8..1ce729d8761f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaff23a95aea5f000895f50d90e91f1e2f727002
+refs/heads/master: dce766af541f6605fa9889892c0280bab31c66ab
diff --git a/trunk/net/bridge/netfilter/ebtables.c b/trunk/net/bridge/netfilter/ebtables.c
index bd1c65425d4f..0b7f262cd148 100644
--- a/trunk/net/bridge/netfilter/ebtables.c
+++ b/trunk/net/bridge/netfilter/ebtables.c
@@ -1406,6 +1406,9 @@ static int do_ebt_set_ctl(struct sock *sk,
 {
 	int ret;
 
+	if (!capable(CAP_NET_ADMIN))
+		return -EPERM;
+
 	switch(cmd) {
 	case EBT_SO_SET_ENTRIES:
 		ret = do_replace(sock_net(sk), user, len);
@@ -1425,6 +1428,9 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
 	struct ebt_replace tmp;
 	struct ebt_table *t;
 
+	if (!capable(CAP_NET_ADMIN))
+		return -EPERM;
+
 	if (copy_from_user(&tmp, user, sizeof(tmp)))
 		return -EFAULT;