Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

S390 bpf_jit.S is removed in net-next and had changes in 'net',
since that code isn't used any more take the removal.

TLS data structures split the TX and RX components in 'net-next',
put the new struct members from the bug fix in 'net' into the RX
part.

The 'net-next' tree had some reworking of how the ERSPAN code works in
the GRE tunneling code, overlapping with a one-line headroom
calculation fix in 'net'.

Overlapping changes in __sock_map_ctx_update_elem(), keep the bits
that read the prog members via READ_ONCE() into local variables
before using them.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 28 insertions, 22 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 5c508d26b367..6bd9358e5e62 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4578,6 +4578,7 @@ static int selinux_socket_post_create(struct socket *sock, int family,
 static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, int addrlen)
 {
         struct sock *sk = sock->sk;
+        struct sk_security_struct *sksec = sk->sk_security;
         u16 family;
         int err;
 
@@ -4589,11 +4590,11 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
         family = sk->sk_family;
         if (family == PF_INET || family == PF_INET6) {
                 char *addrp;
-                struct sk_security_struct *sksec = sk->sk_security;
                 struct common_audit_data ad;
                 struct lsm_network_audit net = {0,};
                 struct sockaddr_in *addr4 = NULL;
                 struct sockaddr_in6 *addr6 = NULL;
+                u16 family_sa = address->sa_family;
                 unsigned short snum;
                 u32 sid, node_perm;
 
@@ -4603,11 +4604,20 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
                  * need to check address->sa_family as it is possible to have
                  * sk->sk_family = PF_INET6 with addr->sa_family = AF_INET.
                  */
-                switch (address->sa_family) {
+                switch (family_sa) {
+                case AF_UNSPEC:
                 case AF_INET:
                         if (addrlen < sizeof(struct sockaddr_in))
                                 return -EINVAL;
                         addr4 = (struct sockaddr_in *)address;
+                        if (family_sa == AF_UNSPEC) {
+                                /* see __inet_bind(), we only want to allow
+                                 * AF_UNSPEC if the address is INADDR_ANY
+                                 */
+                                if (addr4->sin_addr.s_addr != htonl(INADDR_ANY))
+                                        goto err_af;
+                                family_sa = AF_INET;
+                        }
                         snum = ntohs(addr4->sin_port);
                         addrp = (char *)&addr4->sin_addr.s_addr;
                         break;
@@ -4619,15 +4629,14 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
                         addrp = (char *)&addr6->sin6_addr.s6_addr;
                         break;
                 default:
-                        /* Note that SCTP services expect -EINVAL, whereas
-                         * others expect -EAFNOSUPPORT.
-                         */
-                        if (sksec->sclass == SECCLASS_SCTP_SOCKET)
-                                return -EINVAL;
-                        else
-                                return -EAFNOSUPPORT;
+                        goto err_af;
                 }
 
+                ad.type = LSM_AUDIT_DATA_NET;
+                ad.u.net = &net;
+                ad.u.net->sport = htons(snum);
+                ad.u.net->family = family_sa;
+
                 if (snum) {
                         int low, high;
 
@@ -4639,10 +4648,6 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
                                                       snum, &sid);
                                 if (err)
                                         goto out;
-                                ad.type = LSM_AUDIT_DATA_NET;
-                                ad.u.net = &net;
-                                ad.u.net->sport = htons(snum);
-                                ad.u.net->family = family;
                                 err = avc_has_perm(&selinux_state,
                                                    sksec->sid, sid,
                                                    sksec->sclass,
@@ -4674,16 +4679,11 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
                         break;
                 }
 
-                err = sel_netnode_sid(addrp, family, &sid);
+                err = sel_netnode_sid(addrp, family_sa, &sid);
                 if (err)
                         goto out;
 
-                ad.type = LSM_AUDIT_DATA_NET;
-                ad.u.net = &net;
-                ad.u.net->sport = htons(snum);
-                ad.u.net->family = family;
-
-                if (address->sa_family == AF_INET)
+                if (family_sa == AF_INET)
                         ad.u.net->v4info.saddr = addr4->sin_addr.s_addr;
                 else
                         ad.u.net->v6info.saddr = addr6->sin6_addr;
@@ -4696,6 +4696,11 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
         }
 out:
         return err;
+err_af:
+        /* Note that SCTP services expect -EINVAL, others -EAFNOSUPPORT. */
+        if (sksec->sclass == SECCLASS_SCTP_SOCKET)
+                return -EINVAL;
+        return -EAFNOSUPPORT;
 }
 
 /* This supports connect(2) and SCTP connect services such as sctp_connectx(3)
@@ -4773,7 +4778,7 @@ static int selinux_socket_connect_helper(struct socket *sock,
                 ad.type = LSM_AUDIT_DATA_NET;
                 ad.u.net = &net;
                 ad.u.net->dport = htons(snum);
-                ad.u.net->family = sk->sk_family;
+                ad.u.net->family = address->sa_family;
                 err = avc_has_perm(&selinux_state,
                                    sksec->sid, sid, sksec->sclass, perm, &ad);
                 if (err)
@@ -5274,6 +5279,7 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
         while (walk_size < addrlen) {
                 addr = addr_buf;
                 switch (addr->sa_family) {
+                case AF_UNSPEC:
                 case AF_INET:
                         len = sizeof(struct sockaddr_in);
                         break;
@@ -5281,7 +5287,7 @@ static int selinux_sctp_bind_connect(struct sock *sk, int optname,
                         len = sizeof(struct sockaddr_in6);
                         break;
                 default:
-                        return -EAFNOSUPPORT;
+                        return -EINVAL;
                 }
 
                 err = -EINVAL;