3 files changed, 11 insertions, 9 deletions

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 893af8a2fa1e..7bd6f138236b 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -114,19 +114,20 @@ int ipv6_skb_to_auditdata(struct sk_buff *skb,
         int offset, ret = 0;
         struct ipv6hdr *ip6;
         u8 nexthdr;
+        __be16 frag_off;
 
         ip6 = ipv6_hdr(skb);
         if (ip6 == NULL)
                 return -EINVAL;
-        ipv6_addr_copy(&ad->u.net.v6info.saddr, &ip6->saddr);
-        ipv6_addr_copy(&ad->u.net.v6info.daddr, &ip6->daddr);
+        ad->u.net.v6info.saddr = ip6->saddr;
+        ad->u.net.v6info.daddr = ip6->daddr;
         ret = 0;
         /* IPv6 can have several extension header before the Transport header
          * skip them */
         offset = skb_network_offset(skb);
         offset += sizeof(*ip6);
         nexthdr = ip6->nexthdr;
-        offset = ipv6_skip_exthdr(skb, offset, &nexthdr);
+        offset = ipv6_skip_exthdr(skb, offset, &nexthdr, &frag_off);
         if (offset < 0)
                 return 0;
         if (proto)
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 1126c10a5e82..86305c2f555a 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -1090,7 +1090,7 @@ static inline u16 socket_type_to_security_class(int family, int type, int protoc
                         return SECCLASS_NETLINK_ROUTE_SOCKET;
                 case NETLINK_FIREWALL:
                         return SECCLASS_NETLINK_FIREWALL_SOCKET;
-                case NETLINK_INET_DIAG:
+                case NETLINK_SOCK_DIAG:
                         return SECCLASS_NETLINK_TCPDIAG_SOCKET;
                 case NETLINK_NFLOG:
                         return SECCLASS_NETLINK_NFLOG_SOCKET;
@@ -3561,19 +3561,20 @@ static int selinux_parse_skb_ipv6(struct sk_buff *skb,
         u8 nexthdr;
         int ret = -EINVAL, offset;
         struct ipv6hdr _ipv6h, *ip6;
+        __be16 frag_off;
 
         offset = skb_network_offset(skb);
         ip6 = skb_header_pointer(skb, offset, sizeof(_ipv6h), &_ipv6h);
         if (ip6 == NULL)
                 goto out;
 
-        ipv6_addr_copy(&ad->u.net.v6info.saddr, &ip6->saddr);
-        ipv6_addr_copy(&ad->u.net.v6info.daddr, &ip6->daddr);
+        ad->u.net.v6info.saddr = ip6->saddr;
+        ad->u.net.v6info.daddr = ip6->daddr;
         ret = 0;
 
         nexthdr = ip6->nexthdr;
         offset += sizeof(_ipv6h);
-        offset = ipv6_skip_exthdr(skb, offset, &nexthdr);
+        offset = ipv6_skip_exthdr(skb, offset, &nexthdr, &frag_off);
         if (offset < 0)
                 goto out;
 
@@ -3871,7 +3872,7 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
                 if (family == PF_INET)
                         ad.u.net.v4info.saddr = addr4->sin_addr.s_addr;
                 else
-                        ipv6_addr_copy(&ad.u.net.v6info.saddr, &addr6->sin6_addr);
+                        ad.u.net.v6info.saddr = addr6->sin6_addr;
 
                 err = avc_has_perm(sksec->sid, sid,
                                    sksec->sclass, node_perm, &ad);
diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index 3bf46abaa688..86365857c088 100644
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -220,7 +220,7 @@ static int sel_netnode_sid_slow(void *addr, u16 family, u32 *sid)
         case PF_INET6:
                 ret = security_node_sid(PF_INET6,
                                         addr, sizeof(struct in6_addr), sid);
-                ipv6_addr_copy(&new->nsec.addr.ipv6, addr);
+                new->nsec.addr.ipv6 = *(struct in6_addr *)addr;
                 break;
         default:
                 BUG();