Commit 911656f8 authored by Stephen Smalley's avatar Stephen Smalley Committed by Linus Torvalds

[PATCH] selinux: Fix address length checks in connect hook

This patch fixes the address length checks in the selinux_socket_connect
hook to be no more restrictive than the underlying ipv4 and ipv6 code;
otherwise, this hook can reject valid connect calls.  This patch is in
response to a bug report where an application was calling connect on an
INET6 socket with an address that didn't include the optional scope id and
failing due to these checks.
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarJames Morris <jmorris@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f0b9d796
...@@ -3126,12 +3126,12 @@ static int selinux_socket_connect(struct socket *sock, struct sockaddr *address, ...@@ -3126,12 +3126,12 @@ static int selinux_socket_connect(struct socket *sock, struct sockaddr *address,
if (sk->sk_family == PF_INET) { if (sk->sk_family == PF_INET) {
addr4 = (struct sockaddr_in *)address; addr4 = (struct sockaddr_in *)address;
if (addrlen != sizeof(struct sockaddr_in)) if (addrlen < sizeof(struct sockaddr_in))
return -EINVAL; return -EINVAL;
snum = ntohs(addr4->sin_port); snum = ntohs(addr4->sin_port);
} else { } else {
addr6 = (struct sockaddr_in6 *)address; addr6 = (struct sockaddr_in6 *)address;
if (addrlen != sizeof(struct sockaddr_in6)) if (addrlen < SIN6_LEN_RFC2133)
return -EINVAL; return -EINVAL;
snum = ntohs(addr6->sin6_port); snum = ntohs(addr6->sin6_port);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment