- up to 3.8.1

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 0660f7e9c47418fa4f7a2c15bbce828915779c2f..ebdc93f473a065ec85d2d6100eb28933bc3c7828 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -49,34 +49,3 @@ index 7a0c800..ec5ebbb 100644
 -- 
 1.7.7.3
 
-
-commit 6e601a53566d84e1ffd25e7b6fe0b6894ffd79c0
-Author: Mathias Krause <minipli@googlemail.com>
-Date:   Sat Feb 23 01:13:47 2013 +0000
-
-    sock_diag: Fix out-of-bounds access to sock_diag_handlers[]
-    
-    Userland can send a netlink message requesting SOCK_DIAG_BY_FAMILY
-    with a family greater or equal then AF_MAX -- the array size of
-    sock_diag_handlers[]. The current code does not test for this
-    condition therefore is vulnerable to an out-of-bound access opening
-    doors for a privilege escalation.
-    
-    Signed-off-by: Mathias Krause <minipli@googlemail.com>
-    Acked-by: Eric Dumazet <edumazet@google.com>
-    Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
-index 602cd63..750f44f 100644
---- a/net/core/sock_diag.c
-+++ b/net/core/sock_diag.c
-@@ -121,6 +121,9 @@ static int __sock_diag_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
-       if (nlmsg_len(nlh) < sizeof(*req))
-               return -EINVAL;
- 
-+      if (req->sdiag_family >= AF_MAX)
-+              return -EINVAL;
-+
-       hndl = sock_diag_lock_handler(req->sdiag_family);
-       if (hndl == NULL)
-               err = -ENOENT;