aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-01-25 21:44:48 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2016-01-25 21:44:48 +0000
commita29c7ca3d9832f92b16f63e4b006854a9ae3a6cf (patch)
treeb129c5636e14128f30de96bdb973b3ae6094f3c3 /target
parent4807ca67d6c7be91572029eb6023a9916ddcc131 (diff)
downloadupstream-a29c7ca3d9832f92b16f63e4b006854a9ae3a6cf.tar.gz
upstream-a29c7ca3d9832f92b16f63e4b006854a9ae3a6cf.tar.bz2
upstream-a29c7ca3d9832f92b16f63e4b006854a9ae3a6cf.zip
kernel: update kernel 4.3 to version 4.3.4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 48498
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-4.3/010-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch75
-rw-r--r--target/linux/generic/patches-4.3/650-pppoe_header_pad.patch4
-rw-r--r--target/linux/generic/patches-4.3/700-swconfig.patch2
-rw-r--r--target/linux/generic/patches-4.3/901-debloat_sock_diag.patch2
-rw-r--r--target/linux/generic/patches-4.3/902-debloat_proc.patch2
-rw-r--r--target/linux/ramips/patches-4.3/0033-USB-add-xhci-hooks.patch2
6 files changed, 6 insertions, 81 deletions
diff --git a/target/linux/generic/patches-4.3/010-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/target/linux/generic/patches-4.3/010-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
deleted file mode 100644
index 9c6a969738..0000000000
--- a/target/linux/generic/patches-4.3/010-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7ca88764d45c209791e8813131c1457c2e9e51e7 Mon Sep 17 00:00:00 2001
-From: Yevgeny Pats <yevgeny@perception-point.io>
-Date: Mon, 11 Jan 2016 12:05:28 +0000
-Subject: KEYS: Fix keyring ref leak in join_session_keyring()
-
-If a thread is asked to join as a session keyring the keyring that's already
-set as its session, we leak a keyring reference.
-
-This can be tested with the following program:
-
- #include <stddef.h>
- #include <stdio.h>
- #include <sys/types.h>
- #include <keyutils.h>
-
- int main(int argc, const char *argv[])
- {
- int i = 0;
- key_serial_t serial;
-
- serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
- "leaked-keyring");
- if (serial < 0) {
- perror("keyctl");
- return -1;
- }
-
- if (keyctl(KEYCTL_SETPERM, serial,
- KEY_POS_ALL | KEY_USR_ALL) < 0) {
- perror("keyctl");
- return -1;
- }
-
- for (i = 0; i < 100; i++) {
- serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
- "leaked-keyring");
- if (serial < 0) {
- perror("keyctl");
- return -1;
- }
- }
-
- return 0;
- }
-
-If, after the program has run, there something like the following line in
-/proc/keys:
-
-3f3d898f I--Q--- 100 perm 3f3f0000 0 0 keyring leaked-keyring: empty
-
-with a usage count of 100 * the number of times the program has been run,
-then the kernel is malfunctioning. If leaked-keyring has zero usages or
-has been garbage collected, then the problem is fixed.
-
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
-index a3f85d2..e6d50172 100644
---- a/security/keys/process_keys.c
-+++ b/security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- ret = PTR_ERR(keyring);
- goto error2;
- } else if (keyring == new->session_keyring) {
-+ key_put(keyring);
- ret = 0;
- goto error2;
- }
---
-2.7.0.rc3
-
diff --git a/target/linux/generic/patches-4.3/650-pppoe_header_pad.patch b/target/linux/generic/patches-4.3/650-pppoe_header_pad.patch
index 2804469952..adba206c08 100644
--- a/target/linux/generic/patches-4.3/650-pppoe_header_pad.patch
+++ b/target/linux/generic/patches-4.3/650-pppoe_header_pad.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
-@@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct socket *
+@@ -877,7 +877,7 @@ static int pppoe_sendmsg(struct socket *
goto end;
@@ -9,7 +9,7 @@
0, GFP_KERNEL);
if (!skb) {
error = -ENOMEM;
-@@ -879,7 +879,7 @@ static int pppoe_sendmsg(struct socket *
+@@ -885,7 +885,7 @@ static int pppoe_sendmsg(struct socket *
}
/* Reserve space for headers. */
diff --git a/target/linux/generic/patches-4.3/700-swconfig.patch b/target/linux/generic/patches-4.3/700-swconfig.patch
index 2b4c20e5ec..d5eba0b329 100644
--- a/target/linux/generic/patches-4.3/700-swconfig.patch
+++ b/target/linux/generic/patches-4.3/700-swconfig.patch
@@ -29,7 +29,7 @@
obj-$(CONFIG_DAVICOM_PHY) += davicom.o
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
-@@ -385,6 +385,7 @@ header-y += stddef.h
+@@ -386,6 +386,7 @@ header-y += stddef.h
header-y += string.h
header-y += suspend_ioctls.h
header-y += swab.h
diff --git a/target/linux/generic/patches-4.3/901-debloat_sock_diag.patch b/target/linux/generic/patches-4.3/901-debloat_sock_diag.patch
index bf03c395a7..0a2c9a69b6 100644
--- a/target/linux/generic/patches-4.3/901-debloat_sock_diag.patch
+++ b/target/linux/generic/patches-4.3/901-debloat_sock_diag.patch
@@ -25,7 +25,7 @@
obj-$(CONFIG_PROC_FS) += net-procfs.o
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -1454,9 +1454,11 @@ void sk_destruct(struct sock *sk)
+@@ -1453,9 +1453,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk)
{
diff --git a/target/linux/generic/patches-4.3/902-debloat_proc.patch b/target/linux/generic/patches-4.3/902-debloat_proc.patch
index 5d74f43d24..cf59d71c0b 100644
--- a/target/linux/generic/patches-4.3/902-debloat_proc.patch
+++ b/target/linux/generic/patches-4.3/902-debloat_proc.patch
@@ -173,7 +173,7 @@
goto err;
--- a/net/core/sock.c
+++ b/net/core/sock.c
-@@ -2969,6 +2969,8 @@ static __net_initdata struct pernet_oper
+@@ -2968,6 +2968,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void)
{
diff --git a/target/linux/ramips/patches-4.3/0033-USB-add-xhci-hooks.patch b/target/linux/ramips/patches-4.3/0033-USB-add-xhci-hooks.patch
index db29293584..d0acad3ef6 100644
--- a/target/linux/ramips/patches-4.3/0033-USB-add-xhci-hooks.patch
+++ b/target/linux/ramips/patches-4.3/0033-USB-add-xhci-hooks.patch
@@ -59,7 +59,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/* EHCI, OHCI */
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -1287,7 +1287,7 @@ static void hub_quiesce(struct usb_hub *
+@@ -1291,7 +1291,7 @@ static void hub_quiesce(struct usb_hub *
if (type != HUB_SUSPEND) {
/* Disconnect all the children */
for (i = 0; i < hdev->maxchild; ++i) {