2 files changed, 17 insertions, 10 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 9292a8971e66..689fe2d22165 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5762,21 +5762,21 @@ static struct nf_hook_ops selinux_ipv4_ops[] = {
         {
                 .hook =         selinux_ipv4_postroute,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET,
+                .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_POST_ROUTING,
                 .priority =     NF_IP_PRI_SELINUX_LAST,
         },
         {
                 .hook =         selinux_ipv4_forward,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET,
+                .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_FORWARD,
                 .priority =     NF_IP_PRI_SELINUX_FIRST,
         },
         {
                 .hook =         selinux_ipv4_output,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET,
+                .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_LOCAL_OUT,
                 .priority =     NF_IP_PRI_SELINUX_FIRST,
         }
@@ -5788,14 +5788,14 @@ static struct nf_hook_ops selinux_ipv6_ops[] = {
         {
                 .hook =         selinux_ipv6_postroute,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET6,
+                .pf =           NFPROTO_IPV6,
                 .hooknum =      NF_INET_POST_ROUTING,
                 .priority =     NF_IP6_PRI_SELINUX_LAST,
         },
         {
                 .hook =         selinux_ipv6_forward,
                 .owner =        THIS_MODULE,
-                .pf =           PF_INET6,
+                .pf =           NFPROTO_IPV6,
                 .hooknum =      NF_INET_FORWARD,
                 .priority =     NF_IP6_PRI_SELINUX_FIRST,
         }
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index 161e01a6c7ef..8a77725423e0 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__);
@@ -108,8 +111,12 @@ void selnl_notify_policyload(u32 seqno)
 
 static int __init selnl_init(void)
 {
+        struct netlink_kernel_cfg cfg = {
+                .groups = SELNLGRP_MAX,
+        };
+
         selnl = netlink_kernel_create(&init_net, NETLINK_SELINUX,
-                                      SELNLGRP_MAX, NULL, NULL, THIS_MODULE);
+                                      THIS_MODULE, &cfg);
         if (selnl == NULL)
                 panic("SELinux:  Cannot create netlink socket.");
         netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV);