diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-05-11 12:07:06 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-05-12 12:36:28 +0200 |
| commit | 7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c (patch) | |
| tree | dfca30413303b6988cf4f69879b6ac0b1ff811e1 /target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | ef2d5a2ab46c44ad4145488913ac9d0bbb8c69df (diff) | |
| download | upstream-7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c.tar.gz upstream-7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c.tar.bz2 upstream-7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c.zip | |
kernel: bump 4.19 to 4.19.122
Refreshed all patches.
Remove upstreamed:
- 551-loop-Better-discard-support-for-block-devices.patch
Fixed:
- CVE-2020-11884
- CVE-2020-12114
- CVE-2019-3016
- CVE-2020-11669
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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 75cc8d2f7d..ccfd89f703 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 -@@ -5456,6 +5456,9 @@ static enum gro_result dev_gro_receive(s +@@ -5457,6 +5457,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; -@@ -7114,6 +7117,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7115,6 +7118,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, -@@ -7164,6 +7209,7 @@ static int __netdev_upper_dev_link(struc +@@ -7165,6 +7210,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); -@@ -7256,6 +7302,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7257,6 +7303,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); -@@ -7895,6 +7942,7 @@ int dev_set_mac_address(struct net_devic +@@ -7896,6 +7943,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |