diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-26 21:41:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-26 21:54:06 -0700 |
| commit | 01f534d0ae9d7b3ad4dcd943d53418731da82ea7 (patch) | |
| tree | fe28a740034f70149a07812e62b5b88080e95531 /security | |
| parent | b61bb01974730e2fd7d36ab4cc848ca6f44cffd4 (diff) | |
| download | linux-stable-01f534d0ae9d7b3ad4dcd943d53418731da82ea7.tar.gz linux-stable-01f534d0ae9d7b3ad4dcd943d53418731da82ea7.tar.bz2 linux-stable-01f534d0ae9d7b3ad4dcd943d53418731da82ea7.zip | |
selinux: netlink: Move away from NLMSG_PUT().
And use nlmsg_data() while we're here too.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/netlink.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c index 161e01a6c7ef..8a23a35b9c5b 100644 --- a/security/selinux/netlink.c +++ b/security/selinux/netlink.c @@ -19,6 +19,7 @@ #include <linux/netlink.h> #include <linux/selinux_netlink.h> #include <net/net_namespace.h> +#include <net/netlink.h> #include "security.h" @@ -47,7 +48,7 @@ static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void * { switch (msgtype) { case SELNL_MSG_SETENFORCE: { - struct selnl_msg_setenforce *msg = NLMSG_DATA(nlh); + struct selnl_msg_setenforce *msg = nlmsg_data(nlh); memset(msg, 0, len); msg->val = *((int *)data); @@ -55,7 +56,7 @@ static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void * } case SELNL_MSG_POLICYLOAD: { - struct selnl_msg_policyload *msg = NLMSG_DATA(nlh); + struct selnl_msg_policyload *msg = nlmsg_data(nlh); memset(msg, 0, len); msg->seqno = *((u32 *)data); @@ -81,7 +82,9 @@ static void selnl_notify(int msgtype, void *data) goto oom; tmp = skb->tail; - nlh = NLMSG_PUT(skb, 0, 0, msgtype, len); + nlh = nlmsg_put(skb, 0, 0, msgtype, len, 0); + if (!nlh) + goto out_kfree_skb; selnl_add_payload(nlh, len, msgtype, data); nlh->nlmsg_len = skb->tail - tmp; NETLINK_CB(skb).dst_group = SELNLGRP_AVC; @@ -89,7 +92,7 @@ static void selnl_notify(int msgtype, void *data) out: return; -nlmsg_failure: +out_kfree_skb: kfree_skb(skb); oom: printk(KERN_ERR "SELinux: OOM in %s\n", __func__); |