Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

netlink: kill eff_cap from struct netlink_skb_parms

Browse source 
Netlink message processing in the kernel is synchronous these days,
capabilities can be checked directly in security_netlink_recv() from
the current process.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Reviewed-by: James Morris <jmorris@namei.org>
[chrisw: update to include pohmelfs and uvesafb]
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2011-03-03 13:32:07 -08:00 committed by David S. Miller
parent 63f9742516
commit 01a16b21d6
7 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/block/drbd/drbd_nl.c
View file

@ -2177,7 +2177,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
return; return;
} }
if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN)) { if (!cap_raised(current_cap(), CAP_SYS_ADMIN)) {
retcode = ERR_PERM; retcode = ERR_PERM;
goto fail; goto fail;
} }

2
drivers/md/dm-log-userspace-transfer.c
View file

@ -134,7 +134,7 @@ static void cn_ulog_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)
{ {
struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1); struct dm_ulog_request *tfr = (struct dm_ulog_request *)(msg + 1);
if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN)) if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
return; return;
spin_lock(&receiving_list_lock); spin_lock(&receiving_list_lock);

2
drivers/staging/pohmelfs/config.c
View file

@ -525,7 +525,7 @@ static void pohmelfs_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *n
{ {
int err; int err;
if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN)) if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
return; return;
switch (msg->flags) { switch (msg->flags) {

2
drivers/video/uvesafb.c
View file

@ -73,7 +73,7 @@ static void uvesafb_cn_callback(struct cn_msg *msg, struct netlink_skb_parms *ns
struct uvesafb_task *utask; struct uvesafb_task *utask;
struct uvesafb_ktask *task; struct uvesafb_ktask *task;
if (!cap_raised(nsp->eff_cap, CAP_SYS_ADMIN)) if (!cap_raised(current_cap(), CAP_SYS_ADMIN))
return; return;
if (msg->seq >= UVESAFB_TASKS_MAX) if (msg->seq >= UVESAFB_TASKS_MAX)

1
include/linux/netlink.h
View file

@ -160,7 +160,6 @@ struct netlink_skb_parms {
struct ucred creds; /* Skb credentials */ struct ucred creds; /* Skb credentials */
__u32 pid; __u32 pid;
__u32 dst_group; __u32 dst_group;
kernel_cap_t eff_cap;
}; };
#define NETLINK_CB(skb) (*(struct netlink_skb_parms*)&((skb)->cb)) #define NETLINK_CB(skb) (*(struct netlink_skb_parms*)&((skb)->cb))

6
net/netlink/af_netlink.c
View file

@ -1364,12 +1364,6 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
NETLINK_CB(skb).dst_group = dst_group; NETLINK_CB(skb).dst_group = dst_group;
memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred)); memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred));
/* What can I do? Netlink is asynchronous, so that
we will have to save current capabilities to
check them, when this message will be delivered
to corresponding kernel module. --ANK (980802)
*/
err = -EFAULT; err = -EFAULT;
if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) { if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
kfree_skb(skb); kfree_skb(skb);

3
security/commoncap.c
View file

@ -52,13 +52,12 @@ static void warn_setuid_and_fcaps_mixed(const char *fname)
int cap_netlink_send(struct sock *sk, struct sk_buff *skb) int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
{ {
NETLINK_CB(skb).eff_cap = current_cap();
return 0; return 0;
} }
int cap_netlink_recv(struct sk_buff *skb, int cap) int cap_netlink_recv(struct sk_buff *skb, int cap)
{ {
if (!cap_raised(NETLINK_CB(skb).eff_cap, cap)) if (!cap_raised(current_cap(), cap))
return -EPERM; return -EPERM;
return 0; return 0;
} }