diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 01:34:26 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
commit | 6062d858929df927e244280ec4864b35a217d6d1 (patch) | |
tree | 6ff4342b85f5b4953b16f9561176d2ea0f1b4fa2 /target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
parent | ce958dd88a7e74cd7aa7c345c97c79556bc2d926 (diff) | |
download | upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.gz upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.bz2 upstream-6062d858929df927e244280ec4864b35a217d6d1.zip |
kernel: Update kernel 4.19 to version 4.19.131
Fixes:
- CVE-2020-10757
The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was
backported which needed some adaptations to other code.
Run tested: ath79
Build tested: ath79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
-rw-r--r-- | target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index ccfd89f703..c01a090b73 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5457,6 +5457,9 @@ static enum gro_result dev_gro_receive(s +@@ -5461,6 +5461,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -7115,6 +7118,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7119,6 +7122,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7165,6 +7210,7 @@ static int __netdev_upper_dev_link(struc +@@ -7169,6 +7214,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7257,6 +7303,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7261,6 +7307,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -7896,6 +7943,7 @@ int dev_set_mac_address(struct net_devic +@@ -7900,6 +7947,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |