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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Jun 2014 19:15:38 +0000 (15:15 -0400)
commit286a056788f863a2abe103a0efa46f6c412eb850
tree5cce947ccdfcdf58b3bb6f38d0b98c2ec3513394
parent8cc00d08cd6f880a67371c7a838379be2b2a894c
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/sock_diag.h
net/core/sock_diag.c
net/packet/diag.c