diff options
| author | Andrew Lutomirski <luto@amacapital.net> | 2014-04-17 08:41:34 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-29 13:49:17 +0400 |
| commit | 6bebcc8d95669e32c9ac6e836e985ae50392ae23 (patch) | |
| tree | 8979a19a4ad30347aa28a1827152815ddfb029e0 /include/linux/sock_diag.h | |
| parent | 88830f227a1f96e44d82ddfcb0cc81d517ec6dd8 (diff) | |
| download | linux-6bebcc8d95669e32c9ac6e836e985ae50392ae23.tar.xz | |
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'include/linux/sock_diag.h')
| -rw-r--r-- | include/linux/sock_diag.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h index 54f91d35e5fd..302ab805b0bb 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 |