Skip to content

Commit bbf5a1d

Browse files
l0kodpcmoore
authored andcommitted
selinux: Fix error priority for bind with AF_UNSPEC on PF_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 a549d05 ("selftests/landlock: Add network tests"). Cc: Eric Paris <eparis@parisplace.org> Cc: Konstantin Meskhidze <konstantin.meskhidze@huawei.com> Cc: Paul Moore <paul@paul-moore.com> Cc: Stephen Smalley <stephen.smalley.work@gmail.com> Reported-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Closes: https://lore.kernel.org/r/0584f91c-537c-4188-9e4f-04f192565667@collabora.com Fixes: 0f8db8c ("selinux: add AF_UNSPEC and INADDR_ANY checks to selinux_socket_bind()") Signed-off-by: Mickaël Salaün <mic@digikod.net> Tested-by: Muhammad Usama Anjum <usama.anjum@collabora.com> Signed-off-by: Paul Moore <paul@paul-moore.com>
1 parent cc2a734 commit bbf5a1d

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

security/selinux/hooks.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4695,6 +4695,13 @@ static int selinux_socket_bind(struct socket *sock, struct sockaddr *address, in
46954695
return -EINVAL;
46964696
addr4 = (struct sockaddr_in *)address;
46974697
if (family_sa == AF_UNSPEC) {
4698+
if (family == PF_INET6) {
4699+
/* Length check from inet6_bind_sk() */
4700+
if (addrlen < SIN6_LEN_RFC2133)
4701+
return -EINVAL;
4702+
/* Family check from __inet6_bind() */
4703+
goto err_af;
4704+
}
46984705
/* see __inet_bind(), we only want to allow
46994706
* AF_UNSPEC if the address is INADDR_ANY
47004707
*/

0 commit comments

Comments
 (0)