forked from Ivasoft/openwrt
kernel: update 4.9 to 4.9.44
Refresh patches. Adapt 704-phy-no-genphy-soft-reset.patch. Remove brcm2708/950-0005-mm-Remove-the-PFN-busy-warning.patch. Compile-tested on brcm2708/bcm2708 and x86/64. Runtime-tested on brcm2708/bcm2708 and x86/64. Fixes the following vulnerabilities: - CVE-2017-7533 - CVE-2017-1000111 - CVE-2017-1000112 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
@@ -13,10 +13,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
net/ethernet/eth.c | 6 ++++++
|
||||
6 files changed, 58 insertions(+), 14 deletions(-)
|
||||
|
||||
Index: linux-4.9.34/include/linux/netdevice.h
|
||||
===================================================================
|
||||
--- linux-4.9.34.orig/include/linux/netdevice.h
|
||||
+++ linux-4.9.34/include/linux/netdevice.h
|
||||
--- a/include/linux/netdevice.h
|
||||
+++ b/include/linux/netdevice.h
|
||||
@@ -1398,6 +1398,7 @@ enum netdev_priv_flags {
|
||||
IFF_RXFH_CONFIGURED = 1<<25,
|
||||
IFF_PHONY_HEADROOM = 1<<26,
|
||||
@@ -56,10 +54,8 @@ Index: linux-4.9.34/include/linux/netdevice.h
|
||||
/*
|
||||
* Cache lines mostly used on receive path (including eth_type_trans())
|
||||
*/
|
||||
Index: linux-4.9.34/include/linux/skbuff.h
|
||||
===================================================================
|
||||
--- linux-4.9.34.orig/include/linux/skbuff.h
|
||||
+++ linux-4.9.34/include/linux/skbuff.h
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -2334,6 +2334,10 @@ static inline int pskb_trim(struct sk_bu
|
||||
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
||||
}
|
||||
@@ -88,10 +84,8 @@ Index: linux-4.9.34/include/linux/skbuff.h
|
||||
static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
|
||||
unsigned int length)
|
||||
{
|
||||
Index: linux-4.9.34/net/Kconfig
|
||||
===================================================================
|
||||
--- linux-4.9.34.orig/net/Kconfig
|
||||
+++ linux-4.9.34/net/Kconfig
|
||||
--- a/net/Kconfig
|
||||
+++ b/net/Kconfig
|
||||
@@ -25,6 +25,12 @@ menuconfig NET
|
||||
|
||||
if NET
|
||||
@@ -105,11 +99,9 @@ Index: linux-4.9.34/net/Kconfig
|
||||
config WANT_COMPAT_NETLINK_MESSAGES
|
||||
bool
|
||||
help
|
||||
Index: linux-4.9.34/net/core/dev.c
|
||||
===================================================================
|
||||
--- linux-4.9.34.orig/net/core/dev.c
|
||||
+++ linux-4.9.34/net/core/dev.c
|
||||
@@ -2931,10 +2931,20 @@ static int xmit_one(struct sk_buff *skb,
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -2939,10 +2939,20 @@ static int xmit_one(struct sk_buff *skb,
|
||||
if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
|
||||
dev_queue_xmit_nit(skb, dev);
|
||||
|
||||
@@ -134,10 +126,8 @@ Index: linux-4.9.34/net/core/dev.c
|
||||
|
||||
return rc;
|
||||
}
|
||||
Index: linux-4.9.34/net/core/skbuff.c
|
||||
===================================================================
|
||||
--- linux-4.9.34.orig/net/core/skbuff.c
|
||||
+++ linux-4.9.34/net/core/skbuff.c
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -64,6 +64,7 @@
|
||||
#include <linux/errqueue.h>
|
||||
#include <linux/prefetch.h>
|
||||
@@ -169,10 +159,8 @@ Index: linux-4.9.34/net/core/skbuff.c
|
||||
void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off,
|
||||
int size, unsigned int truesize)
|
||||
{
|
||||
Index: linux-4.9.34/net/ethernet/eth.c
|
||||
===================================================================
|
||||
--- linux-4.9.34.orig/net/ethernet/eth.c
|
||||
+++ linux-4.9.34/net/ethernet/eth.c
|
||||
--- a/net/ethernet/eth.c
|
||||
+++ b/net/ethernet/eth.c
|
||||
@@ -171,6 +171,12 @@ __be16 eth_type_trans(struct sk_buff *sk
|
||||
const struct ethhdr *eth;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user