diff options
| author | Hannes Frederic Sowa <hannes@stressinduktion.org> | 2015-12-14 21:03:39 +0000 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-05 18:20:43 +0100 |
| commit | addc2501adac4b0e1c0d814a5901cdead1bb214a (patch) | |
| tree | 99a6e1c9f26f774e706e508a0fca09c85fe928d0 /net/ipv4/af_inet.c | |
| parent | 7ef4fd18068df86a619a91f5eeb611782a26e243 (diff) | |
| download | kernel_samsung_tuna-addc2501adac4b0e1c0d814a5901cdead1bb214a.zip kernel_samsung_tuna-addc2501adac4b0e1c0d814a5901cdead1bb214a.tar.gz kernel_samsung_tuna-addc2501adac4b0e1c0d814a5901cdead1bb214a.tar.bz2 | |
net: add validation for the socket syscall protocol argument
郭永刚 reported that one could simply crash the kernel as root by
using a simple program:
int socket_fd;
struct sockaddr_in addr;
addr.sin_port = 0;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_family = 10;
socket_fd = socket(10,3,0x40000000);
connect(socket_fd , &addr,16);
AF_INET, AF_INET6 sockets actually only support 8-bit protocol
identifiers. inet_sock's skc_protocol field thus is sized accordingly,
thus larger protocol identifiers simply cut off the higher bits and
store a zero in the protocol fields.
This could lead to e.g. NULL function pointer because as a result of
the cut off inet_num is zero and we call down to inet_autobind, which
is NULL for raw sockets.
kernel: Call Trace:
kernel: [<ffffffff816db90e>] ? inet_autobind+0x2e/0x70
kernel: [<ffffffff816db9a4>] inet_dgram_connect+0x54/0x80
kernel: [<ffffffff81645069>] SYSC_connect+0xd9/0x110
kernel: [<ffffffff810ac51b>] ? ptrace_notify+0x5b/0x80
kernel: [<ffffffff810236d8>] ? syscall_trace_enter_phase2+0x108/0x200
kernel: [<ffffffff81645e0e>] SyS_connect+0xe/0x10
kernel: [<ffffffff81779515>] tracesys_phase2+0x84/0x89
I found no particular commit which introduced this problem.
Change-Id: I653fad90da54908144cc8916c2dccb1fa6f14eed
CVE: CVE-2015-8543
Cc: Cong Wang <cwang@twopensource.com>
Reported-by: 郭永刚 <guoyonggang@360.cn>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 5fc9368..7aee197 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -296,6 +296,9 @@ static int inet_create(struct net *net, struct socket *sock, int protocol, int try_loading_module = 0; int err; + if (protocol < 0 || protocol >= IPPROTO_MAX) + return -EINVAL; + if (!current_has_network()) return -EACCES; |