diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-04-23 14:29:27 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-23 10:27:57 +0200 |
| commit | 50b8b6e75fa0c08cef1e1ed30a7ab91f05bcb779 (patch) | |
| tree | c103d35936dd292b3bbede716ffb1cf1e281d13a /drivers | |
| parent | 3b175c7b361838fe80fdd000bf1f0970ca8fbdaf (diff) | |
| download | linux-stable-50b8b6e75fa0c08cef1e1ed30a7ab91f05bcb779.tar.gz linux-stable-50b8b6e75fa0c08cef1e1ed30a7ab91f05bcb779.tar.bz2 linux-stable-50b8b6e75fa0c08cef1e1ed30a7ab91f05bcb779.zip | |
net: Use netlink_ns_capable to verify the permisions of netlink messages
[ Upstream commit 90f62cf30a78721641e08737bda787552428061e ]
It is possible by passing a netlink socket to a more privileged
executable and then to fool that executable into writing to the socket
data that happens to be valid netlink message to do something that
privileged executable did not intend to do.
To keep this from happening replace bare capable and ns_capable calls
with netlink_capable, netlink_net_calls and netlink_ns_capable calls.
Which act the same as the previous calls except they verify that the
opener of the socket had the desired permissions as well.
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 'drivers')
| -rw-r--r-- | drivers/connector/cn_proc.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_netlink.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 18c5b9b16645..3165811e2407 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c @@ -369,7 +369,7 @@ static void cn_proc_mcast_ctl(struct cn_msg *msg, return; /* Can only change if privileged. */ - if (!capable(CAP_NET_ADMIN)) { + if (!__netlink_ns_capable(nsp, &init_user_ns, CAP_NET_ADMIN)) { err = EPERM; goto out; } diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index fe30ea94ffe6..109802f776ed 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c @@ -77,7 +77,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb) goto next_msg; } - if (!capable(CAP_SYS_ADMIN)) { + if (!netlink_capable(skb, CAP_SYS_ADMIN)) { err = -EPERM; goto next_msg; } |