diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-06 14:18:05 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-03-06 14:18:05 +1100 |
| commit | 85443956e7896933c7245625f6000d767c40dd64 (patch) | |
| tree | 13d85acd9675539b45758dbeed2b77d1a2116080 /net | |
| parent | 618ff2531616982a3e6d7438f233dba138d7e2e2 (diff) | |
| parent | fb430b21872613252307d02dd9561da28b51586a (diff) | |
Merge commit 'security-testing/next'
Diffstat (limited to 'net')
| -rw-r--r-- | net/netlink/af_netlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 1ab0da2632e1..61fd2773a453 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -54,7 +54,6 @@ #include <linux/mm.h> #include <linux/types.h> #include <linux/audit.h> -#include <linux/selinux.h> #include <linux/mutex.h> #include <net/net_namespace.h> @@ -1239,7 +1238,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, NETLINK_CB(skb).pid = nlk->pid; NETLINK_CB(skb).dst_group = dst_group; NETLINK_CB(skb).loginuid = audit_get_loginuid(current); - selinux_get_task_sid(current, &(NETLINK_CB(skb).sid)); + security_task_getsecid(current, &(NETLINK_CB(skb).sid)); memcpy(NETLINK_CREDS(skb), &siocb->scm->creds, sizeof(struct ucred)); /* What can I do? Netlink is asynchronous, so that |