net: Move the permission check in sock_diag_put_filterinfo to packet_diag_dump
authorEric W. Biederman <ebiederm@xmission.com>
Wed, 23 Apr 2014 21:26:25 +0000 (14:26 -0700)
committerJiri Slaby <jslaby@suse.cz>
Mon, 23 Jun 2014 08:27:55 +0000 (10:27 +0200)
commit4dcecf4ce16a20c210e91a62ae28275418e3ed2c
tree6ec163cad2e160e5d2e11f5fbf6c7ff00ab53a9b
parent4587dcd284963b76844da9932f6440aa312aec0a
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>
include/linux/sock_diag.h
net/core/sock_diag.c
net/packet/diag.c