aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorAndrew Lutomirski <luto@amacapital.net>2014-04-16 21:41:34 -0700
committerShow Liu <show.liu@linaro.org>2014-06-18 12:03:53 +0800
commitbf0a8064b509b27271e9ec2cd7cbe212b3e0d0da (patch)
tree019f7034310e747ed4519eb7255a8ca6ad705f52 /include/linux
parent76f0ccd0b92780f53339d7052e7af0c990c5147c (diff)
net: Fix ns_capable check in sock_diag_put_filterinfo
[ Upstream commit 78541c1dc60b65ecfce5a6a096fc260219d6784e ] The caller needs capabilities on the namespace being queried, not on their own namespace. This is a security bug, although it likely has only a minor impact. Cc: stable@vger.kernel.org Signed-off-by: Andy Lutomirski <luto@amacapital.net> Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sock_diag.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index 54f91d35e5f..302ab805b0b 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -23,7 +23,7 @@ int sock_diag_check_cookie(void *sk, __u32 *cookie);
void sock_diag_save_cookie(void *sk, __u32 *cookie);
int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr);
-int sock_diag_put_filterinfo(struct user_namespace *user_ns, struct sock *sk,
+int sock_diag_put_filterinfo(struct sock *sk,
struct sk_buff *skb, int attrtype);
#endif