diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-04-24 01:26:25 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-23 12:27:55 +0400 |
| commit | 4dcecf4ce16a20c210e91a62ae28275418e3ed2c (patch) | |
| tree | 6ec163cad2e160e5d2e11f5fbf6c7ff00ab53a9b /include/linux/sock_diag.h | |
| parent | 4587dcd284963b76844da9932f6440aa312aec0a (diff) | |
| download | linux-4dcecf4ce16a20c210e91a62ae28275418e3ed2c.tar.xz | |
net: Move the permission check in sock_diag_put_filterinfo to packet_diag_dump
[ Upstream commit a53b72c83a4216f2eb883ed45a0cbce014b8e62d ]
The permission check in sock_diag_put_filterinfo is wrong, and it is so removed
from it's sources it is not clear why it is wrong. Move the computation
into packet_diag_dump and pass a bool of the result into sock_diag_filterinfo.
This does not yet correct the capability check but instead simply moves it to make
it clear what is going on.
Reported-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.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 302ab805b0bb..46cca4c06848 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 sock *sk, +int sock_diag_put_filterinfo(bool may_report_filterinfo, struct sock *sk, struct sk_buff *skb, int attrtype); #endif |