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>

diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index 161e01a..8a23a35 100644 (file)
--- 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__);