Skip to contentSkip to conversation

selinux: Fix error priority for bind with AF_UNSPEC on AF_INET6 socket

PATCH Superseded Mickaël Salaün 2 participants 2 messages Dec 29, 2023

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selinux: Fix error priority for bind with AF_UNSPEC on AF_INET6 socket

The IPv6 network stack first checks the sockaddr length (-EINVAL error) before checking the family (-EAFNOSUPPORT error).

This was discovered thanks to commit a549d055a22e ("selftests/landlock:
Add network tests").

Cc Eric Paris <[email protected]>
Cc Konstantin Meskhidze <[email protected]>
Cc Paul Moore <[email protected]>
Cc Stephen Smalley <[email protected]>
Fixes 0f8db8cc73df ("selinux: add AF_UNSPEC and INADDR_ANY checks to selinux_socket_bind()")

---

Changes since v1:
https://lore.kernel.org/r/[email protected]
* Use the "family" variable (suggested by Paul).

---
 security/selinux/hooks.c | 3 +++
 1 file changed, 3 insertions(+)
security/selinux/hooks.c +3 -0
index feda711c6b7b..748baa98f623 100644
@@ -4667,6 +4667,9 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
 				return -EINVAL;
 			addr4 = (struct sockaddr_in *)address;
 			if (family_sa == AF_UNSPEC) {
+				if (family == AF_INET6 &&
+				    addrlen < SIN6_LEN_RFC2133)
+					return -EINVAL;
 				/* see __inet_bind(), we only want to allow
 				 * AF_UNSPEC if the address is INADDR_ANY
 				 */
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 29 lines · Mickaël Salaün

The IPv6 network stack first checks the sockaddr length (-EINVAL error) before checking the family (-EAFNOSUPPORT error).

This was discovered thanks to commit a549d055a22e ("selftests/landlock:
Add network tests").

Cc Eric Paris <[email protected]>
Cc Konstantin Meskhidze <[email protected]>
Cc Paul Moore <[email protected]>
Cc Stephen Smalley <[email protected]>
Fixes 0f8db8cc73df ("selinux: add AF_UNSPEC and INADDR_ANY checks to selinux_socket_bind()")

---

Changes since v1:
https://lore.kernel.org/r/[email protected]
* Use the "family" variable (suggested by Paul).

---
 security/selinux/hooks.c | 3 +++
 1 file changed, 3 insertions(+)
security/selinux/hooks.c +0 -0
index feda711c6b7b..748baa98f623 100644

security/selinux/hooks.c static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in · line 4672

Quoted 6 lines
security/selinux/hooks.c +3 -0
@@ -4667,6 +4667,9 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
                                return -EINVAL;
                        addr4 = (struct sockaddr_in *)address;
                        if (family_sa == AF_UNSPEC) {
+                               if (family == AF_INET6 &&
+                                   addrlen < SIN6_LEN_RFC2133)
+                                       return -EINVAL;

If we want to try and match the non-LSM PF_INET6 socket handling as much as possible, after the length check (above) we should fail any non AF_INET6 addresses on an INET6 sock, see __inet6_bind().

My guess is we want something like this:

  if (family == AF_INET6) {
    /* length check from inet6_bind_sk() */
    if (addrlen < SIN6_LEN_RFC2133)
      return -EINVAL;
    /* !AF_INET6 check from __inet6_bind() */
    goto err_af;
  }
Quoted 5 lines
security/selinux/hooks.c +0 -1
                                /* see __inet_bind(), we only want to allow
                                 * AF_UNSPEC if the address is INADDR_ANY
                                 */
--

2.43.0

Signature · 1 line
paul-moore.com