Sync to Linus v4.4-rc2 for LSM developers.

1 files changed, 13 insertions, 16 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 305399225010..d0cfaa9f19d0 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4864,7 +4864,7 @@ static unsigned int selinux_ip_forward(struct sk_buff *skb,
         return NF_ACCEPT;
 }
 
-static unsigned int selinux_ipv4_forward(const struct nf_hook_ops *ops,
+static unsigned int selinux_ipv4_forward(void *priv,
                                          struct sk_buff *skb,
                                          const struct nf_hook_state *state)
 {
@@ -4872,7 +4872,7 @@ static unsigned int selinux_ipv4_forward(const struct nf_hook_ops *ops,
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static unsigned int selinux_ipv6_forward(const struct nf_hook_ops *ops,
+static unsigned int selinux_ipv6_forward(void *priv,
                                          struct sk_buff *skb,
                                          const struct nf_hook_state *state)
 {
@@ -4896,7 +4896,7 @@ static unsigned int selinux_ip_output(struct sk_buff *skb,
         if (sk) {
                 struct sk_security_struct *sksec;
 
-                if (sk->sk_state == TCP_LISTEN)
+                if (sk_listener(sk))
                         /* if the socket is the listening state then this
                          * packet is a SYN-ACK packet which means it needs to
                          * be labeled based on the connection/request_sock and
@@ -4922,7 +4922,7 @@ static unsigned int selinux_ip_output(struct sk_buff *skb,
         return NF_ACCEPT;
 }
 
-static unsigned int selinux_ipv4_output(const struct nf_hook_ops *ops,
+static unsigned int selinux_ipv4_output(void *priv,
                                         struct sk_buff *skb,
                                         const struct nf_hook_state *state)
 {
@@ -4933,7 +4933,7 @@ static unsigned int selinux_ip_postroute_compat(struct sk_buff *skb,
                                                 int ifindex,
                                                 u16 family)
 {
-        struct sock *sk = skb->sk;
+        struct sock *sk = skb_to_full_sk(skb);
         struct sk_security_struct *sksec;
         struct common_audit_data ad;
         struct lsm_network_audit net = {0,};
@@ -4988,7 +4988,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
         if (!secmark_active && !peerlbl_active)
                 return NF_ACCEPT;
 
-        sk = skb->sk;
+        sk = skb_to_full_sk(skb);
 
 #ifdef CONFIG_XFRM
         /* If skb->dst->xfrm is non-NULL then the packet is undergoing an IPsec
@@ -5003,7 +5003,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
          *       unfortunately, this means more work, but it is only once per
          *       connection. */
         if (skb_dst(skb) != NULL && skb_dst(skb)->xfrm != NULL &&
-            !(sk != NULL && sk->sk_state == TCP_LISTEN))
+            !(sk && sk_listener(sk)))
                 return NF_ACCEPT;
 #endif
 
@@ -5020,7 +5020,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
                         secmark_perm = PACKET__SEND;
                         peer_sid = SECINITSID_KERNEL;
                 }
-        } else if (sk->sk_state == TCP_LISTEN) {
+        } else if (sk_listener(sk)) {
                 /* Locally generated packet but the associated socket is in the
                  * listening state which means this is a SYN-ACK packet.  In
                  * this particular case the correct security label is assigned
@@ -5031,7 +5031,9 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
                  * selinux_inet_conn_request().  See also selinux_ip_output()
                  * for similar problems. */
                 u32 skb_sid;
-                struct sk_security_struct *sksec = sk->sk_security;
+                struct sk_security_struct *sksec;
+
+                sksec = sk->sk_security;
                 if (selinux_skb_peerlbl_sid(skb, family, &skb_sid))
                         return NF_DROP;
                 /* At this point, if the returned skb peerlbl is SECSID_NULL
@@ -5097,7 +5099,7 @@ static unsigned int selinux_ip_postroute(struct sk_buff *skb,
         return NF_ACCEPT;
 }
 
-static unsigned int selinux_ipv4_postroute(const struct nf_hook_ops *ops,
+static unsigned int selinux_ipv4_postroute(void *priv,
                                            struct sk_buff *skb,
                                            const struct nf_hook_state *state)
 {
@@ -5105,7 +5107,7 @@ static unsigned int selinux_ipv4_postroute(const struct nf_hook_ops *ops,
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-static unsigned int selinux_ipv6_postroute(const struct nf_hook_ops *ops,
+static unsigned int selinux_ipv6_postroute(void *priv,
                                            struct sk_buff *skb,
                                            const struct nf_hook_state *state)
 {
@@ -6128,21 +6130,18 @@ security_initcall(selinux_init);
 static struct nf_hook_ops selinux_nf_ops[] = {
         {
                 .hook =         selinux_ipv4_postroute,
-                .owner =        THIS_MODULE,
                 .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_POST_ROUTING,
                 .priority =     NF_IP_PRI_SELINUX_LAST,
         },
         {
                 .hook =         selinux_ipv4_forward,
-                .owner =        THIS_MODULE,
                 .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_FORWARD,
                 .priority =     NF_IP_PRI_SELINUX_FIRST,
         },
         {
                 .hook =         selinux_ipv4_output,
-                .owner =        THIS_MODULE,
                 .pf =           NFPROTO_IPV4,
                 .hooknum =      NF_INET_LOCAL_OUT,
                 .priority =     NF_IP_PRI_SELINUX_FIRST,
@@ -6150,14 +6149,12 @@ static struct nf_hook_ops selinux_nf_ops[] = {
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         {
                 .hook =         selinux_ipv6_postroute,
-                .owner =        THIS_MODULE,
                 .pf =           NFPROTO_IPV6,
                 .hooknum =      NF_INET_POST_ROUTING,
                 .priority =     NF_IP6_PRI_SELINUX_LAST,
         },
         {
                 .hook =         selinux_ipv6_forward,
-                .owner =        THIS_MODULE,
                 .pf =           NFPROTO_IPV6,
                 .hooknum =      NF_INET_FORWARD,
                 .priority =     NF_IP6_PRI_SELINUX_FIRST,