debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Update 'net: add validation for the socket syscall protocol argument' to upstream version

This commit is contained in:
Ben Hutchings 2015-12-27 19:21:59 +00:00
parent 6408412cc6
commit fd75678652
1 changed files with 57 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
debian/patches/bugfix/all/net-add-validation-for-the-socket-syscall-protocol.patch vendored
View File

@ -1,7 +1,7 @@
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Mon, 14 Dec 2015 22:03:39 +0100
Subject: net: add validation for the socket syscall protocol argument
Date: Mon, 14 Dec 2015 17:17:49 +0100
Origin: http://article.gmane.org/gmane.linux.network/391482
Origin: https://git.kernel.org/linus/79462ad02e861803b3840cc782248c7359451cd9
郭永刚 reported that one could simply crash the kernel as root by
using a simple program:
@ -36,21 +36,60 @@ kernel: [<ffffffff81779515>] tracesys_phase2+0x84/0x89
I found no particular commit which introduced this problem.
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>
---
net/ipv4/af_inet.c | 3 +++
net/ipv6/af_inet6.c | 3 +++
net/socket.c | 3 +++
3 files changed, 9 insertions(+)
include/net/sock.h | 1 +
net/ax25/af_ax25.c | 3 +++
net/decnet/af_decnet.c | 3 +++
net/ipv4/af_inet.c | 3 +++
net/ipv6/af_inet6.c | 3 +++
net/irda/af_irda.c | 3 +++
6 files changed, 16 insertions(+)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -387,6 +387,7 @@ struct sock {
sk_no_check_rx : 1,
sk_userlocks : 4,
sk_protocol : 8,
+#define SK_PROTOCOL_MAX U8_MAX
sk_type : 16;
kmemcheck_bitfield_end(flags);
int sk_wmem_queued;
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -805,6 +805,9 @@ static int ax25_create(struct net *net,
struct sock *sk;
ax25_cb *ax25;
+ if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
+ return -EINVAL;
+
if (!net_eq(net, &init_net))
return -EAFNOSUPPORT;
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -678,6 +678,9 @@ static int dn_create(struct net *net, st
{
struct sock *sk;
+ if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
+ return -EINVAL;
+
if (!net_eq(net, &init_net))
return -EAFNOSUPPORT;
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -261,6 +261,9 @@ static int inet_create(struct net *net,
int try_loading_module = 0;
int err;
+ if (protocol >= IPPROTO_MAX)
+ if (protocol < 0 || protocol >= IPPROTO_MAX)
+ return -EINVAL;
+
sock->state = SS_UNCONNECTED;
@ -62,21 +101,21 @@ Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
int try_loading_module = 0;
int err;
+ if (protocol >= IPPROTO_MAX)
+ if (protocol < 0 || protocol >= IPPROTO_MAX)
+ return -EINVAL;
+
/* Look for the requested type/protocol pair. */
lookup_protocol:
err = -ESOCKTNOSUPPORT;
--- a/net/socket.c
+++ b/net/socket.c
@@ -1105,6 +1105,9 @@ int __sock_create(struct net *net, int f
return -EAFNOSUPPORT;
if (type < 0 || type >= SOCK_MAX)
return -EINVAL;
+ /* upper bound should be tested by per-protocol .create callbacks */
+ if (protocol < 0)
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1086,6 +1086,9 @@ static int irda_create(struct net *net,
struct sock *sk;
struct irda_sock *self;
+ if (protocol < 0 || protocol > SK_PROTOCOL_MAX)
+ return -EINVAL;
/* Compatibility.
+
if (net != &init_net)
return -EAFNOSUPPORT;