Author: hauke Date: 2016-01-25 22:44:12 +0100 (Mon, 25 Jan 2016) New Revision: 48497
Removed: trunk/target/linux/generic/patches-4.1/012-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch Modified: trunk/include/kernel-version.mk trunk/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch trunk/target/linux/brcm2708/patches-4.1/0004-Add-dwc_otg-driver.patch trunk/target/linux/brcm47xx/patches-4.1/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch trunk/target/linux/generic/patches-4.1/650-pppoe_header_pad.patch trunk/target/linux/generic/patches-4.1/902-debloat_proc.patch Log: kernel: update kernel 4.1 to version 4.1.16 Signed-off-by: Hauke Mehrtens <[email protected]> Modified: trunk/include/kernel-version.mk =================================================================== --- trunk/include/kernel-version.mk 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/include/kernel-version.mk 2016-01-25 21:44:12 UTC (rev 48497) @@ -3,12 +3,12 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .26 -LINUX_VERSION-4.1 = .15 +LINUX_VERSION-4.1 = .16 LINUX_VERSION-4.3 = .3 LINUX_VERSION-4.4 = LINUX_KERNEL_MD5SUM-3.18.26 = fb3ef8da32a25607807887b9567a6927 -LINUX_KERNEL_MD5SUM-4.1.15 = b227333912b161c96ff3e30f5041e1c0 +LINUX_KERNEL_MD5SUM-4.1.16 = e4bf22fed49b476b47acffc00c03267a LINUX_KERNEL_MD5SUM-4.3.3 = f3068333fa524ff98914cf751d0b5710 LINUX_KERNEL_MD5SUM-4.4 = 9a78fa2eb6c68ca5a40ed5af08142599 Modified: trunk/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch =================================================================== --- trunk/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/target/linux/ar71xx/patches-4.1/910-unaligned_access_hacks.patch 2016-01-25 21:44:12 UTC (rev 48497) @@ -214,7 +214,7 @@ #include <linux/uaccess.h> #include <linux/ipv6.h> #include <linux/icmpv6.h> -@@ -775,10 +776,10 @@ static void tcp_v6_send_response(struct +@@ -774,10 +775,10 @@ static void tcp_v6_send_response(struct topt = (__be32 *)(t1 + 1); if (tsecr) { @@ -346,7 +346,7 @@ #endif /* _LINUX_TYPES_H */ --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1323,8 +1323,8 @@ static struct sk_buff **inet_gro_receive +@@ -1326,8 +1326,8 @@ static struct sk_buff **inet_gro_receive if (unlikely(ip_fast_csum((u8 *)iph, 5))) goto out_unlock; Modified: trunk/target/linux/brcm2708/patches-4.1/0004-Add-dwc_otg-driver.patch =================================================================== --- trunk/target/linux/brcm2708/patches-4.1/0004-Add-dwc_otg-driver.patch 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/target/linux/brcm2708/patches-4.1/0004-Add-dwc_otg-driver.patch 2016-01-25 21:44:12 UTC (rev 48497) @@ -894,7 +894,7 @@ } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4906,7 +4906,7 @@ static void port_event(struct usb_hub *h +@@ -4911,7 +4911,7 @@ static void port_event(struct usb_hub *h if (portchange & USB_PORT_STAT_C_OVERCURRENT) { u16 status = 0, unused; Modified: trunk/target/linux/brcm47xx/patches-4.1/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch =================================================================== --- trunk/target/linux/brcm47xx/patches-4.1/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/target/linux/brcm47xx/patches-4.1/800-bcma-add-table-of-serial-flashes-with-smaller-blocks.patch 2016-01-25 21:44:12 UTC (rev 48497) @@ -21,7 +21,7 @@ static struct resource bcma_sflash_resource = { .name = "bcma_sflash", -@@ -41,6 +42,13 @@ static const struct bcma_sflash_tbl_e bc +@@ -42,6 +43,13 @@ static const struct bcma_sflash_tbl_e bc { NULL }, }; @@ -35,7 +35,7 @@ static const struct bcma_sflash_tbl_e bcma_sflash_sst_tbl[] = { { "SST25WF512", 1, 0x1000, 16, }, { "SST25VF512", 0x48, 0x1000, 16, }, -@@ -84,6 +92,24 @@ static void bcma_sflash_cmd(struct bcma_ +@@ -85,6 +93,24 @@ static void bcma_sflash_cmd(struct bcma_ bcma_err(cc->core->bus, "SFLASH control command failed (timeout)!\n"); } @@ -60,7 +60,7 @@ /* Initialize serial flash access */ int bcma_sflash_init(struct bcma_drv_cc *cc) { -@@ -114,6 +140,10 @@ int bcma_sflash_init(struct bcma_drv_cc +@@ -115,6 +141,10 @@ int bcma_sflash_init(struct bcma_drv_cc case 0x13: return -ENOTSUPP; default: Deleted: trunk/target/linux/generic/patches-4.1/012-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/012-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/target/linux/generic/patches-4.1/012-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch 2016-01-25 21:44:12 UTC (rev 48497) @@ -1,75 +0,0 @@ -From 7ca88764d45c209791e8813131c1457c2e9e51e7 Mon Sep 17 00:00:00 2001 -From: Yevgeny Pats <[email protected]> -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 <[email protected]> -Signed-off-by: David Howells <[email protected]> ---- - 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 - Modified: trunk/target/linux/generic/patches-4.1/650-pppoe_header_pad.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/650-pppoe_header_pad.patch 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/target/linux/generic/patches-4.1/650-pppoe_header_pad.patch 2016-01-25 21:44:12 UTC (rev 48497) @@ -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. */ Modified: trunk/target/linux/generic/patches-4.1/902-debloat_proc.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/902-debloat_proc.patch 2016-01-25 21:43:26 UTC (rev 48496) +++ trunk/target/linux/generic/patches-4.1/902-debloat_proc.patch 2016-01-25 21:44:12 UTC (rev 48497) @@ -173,7 +173,7 @@ goto err; --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -2971,6 +2971,8 @@ static __net_initdata struct pernet_oper +@@ -2970,6 +2970,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
