From 039177535d55dcca55b139402ff7290f39031f8f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 10 Nov 2019 11:43:59 +0100 Subject: [PATCH] 4.19-stable patches added patches: bonding-fix-state-transition-issue-in-link-monitoring.patch cdc-ncm-handle-incomplete-transfer-of-mtu.patch ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch net-fix-data-race-in-neigh_event_send.patch net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch nfc-fdp-fix-incorrect-free-object.patch nfc-netlink-fix-double-device-reference-drop.patch nfc-st21nfca-fix-double-free.patch qede-fix-null-pointer-deref-in-__qede_remove.patch --- ...-transition-issue-in-link-monitoring.patch | 212 ++++++++++++++++++ ...cm-handle-incomplete-transfer-of-mtu.patch | 46 ++++ ...e-id-reference-in-fib_sync_down_addr.patch | 35 +++ ...t6_probe-and-fib6_nh-last_probe-init.patch | 128 +++++++++++ ...ount-for-second-possible-vlan-header.patch | 31 +++ ...et-fix-data-race-in-neigh_event_send.patch | 86 +++++++ ...-locks-causing-deadlock-in-napi-path.patch | 142 ++++++++++++ ...ndle-netdev-events-for-other-netdevs.patch | 47 ++++ ...ix-null-pointer-on-lag-slave-removal.patch | 32 +++ ...fix-potential-uaf-when-unregistering.patch | 45 ++++ ...upport-for-dw5821e-with-esim-support.patch | 43 ++++ .../nfc-fdp-fix-incorrect-free-object.patch | 31 +++ ...ink-fix-double-device-reference-drop.patch | 41 ++++ queue-4.19/nfc-st21nfca-fix-double-free.patch | 31 +++ ...-null-pointer-deref-in-__qede_remove.patch | 101 +++++++++ queue-4.19/series | 15 ++ queue-5.3/series | 24 ++ 17 files changed, 1090 insertions(+) create mode 100644 queue-4.19/bonding-fix-state-transition-issue-in-link-monitoring.patch create mode 100644 queue-4.19/cdc-ncm-handle-incomplete-transfer-of-mtu.patch create mode 100644 queue-4.19/ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch create mode 100644 queue-4.19/ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch create mode 100644 queue-4.19/net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch create mode 100644 queue-4.19/net-fix-data-race-in-neigh_event_send.patch create mode 100644 queue-4.19/net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch create mode 100644 queue-4.19/net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch create mode 100644 queue-4.19/net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch create mode 100644 queue-4.19/net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch create mode 100644 queue-4.19/net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch create mode 100644 queue-4.19/nfc-fdp-fix-incorrect-free-object.patch create mode 100644 queue-4.19/nfc-netlink-fix-double-device-reference-drop.patch create mode 100644 queue-4.19/nfc-st21nfca-fix-double-free.patch create mode 100644 queue-4.19/qede-fix-null-pointer-deref-in-__qede_remove.patch create mode 100644 queue-4.19/series create mode 100644 queue-5.3/series diff --git a/queue-4.19/bonding-fix-state-transition-issue-in-link-monitoring.patch b/queue-4.19/bonding-fix-state-transition-issue-in-link-monitoring.patch new file mode 100644 index 00000000000..9336a312aef --- /dev/null +++ b/queue-4.19/bonding-fix-state-transition-issue-in-link-monitoring.patch @@ -0,0 +1,212 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Jay Vosburgh +Date: Fri, 1 Nov 2019 21:56:42 -0700 +Subject: bonding: fix state transition issue in link monitoring + +From: Jay Vosburgh + +[ Upstream commit 1899bb325149e481de31a4f32b59ea6f24e176ea ] + +Since de77ecd4ef02 ("bonding: improve link-status update in +mii-monitoring"), the bonding driver has utilized two separate variables +to indicate the next link state a particular slave should transition to. +Each is used to communicate to a different portion of the link state +change commit logic; one to the bond_miimon_commit function itself, and +another to the state transition logic. + + Unfortunately, the two variables can become unsynchronized, +resulting in incorrect link state transitions within bonding. This can +cause slaves to become stuck in an incorrect link state until a +subsequent carrier state transition. + + The issue occurs when a special case in bond_slave_netdev_event +sets slave->link directly to BOND_LINK_FAIL. On the next pass through +bond_miimon_inspect after the slave goes carrier up, the BOND_LINK_FAIL +case will set the proposed next state (link_new_state) to BOND_LINK_UP, +but the new_link to BOND_LINK_DOWN. The setting of the final link state +from new_link comes after that from link_new_state, and so the slave +will end up incorrectly in _DOWN state. + + Resolve this by combining the two variables into one. + +Reported-by: Aleksei Zakharov +Reported-by: Sha Zhang +Cc: Mahesh Bandewar +Fixes: de77ecd4ef02 ("bonding: improve link-status update in mii-monitoring") +Signed-off-by: Jay Vosburgh +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/bonding/bond_main.c | 41 +++++++++++++++++++--------------------- + include/net/bonding.h | 3 -- + 2 files changed, 21 insertions(+), 23 deletions(-) + +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -2074,8 +2074,7 @@ static int bond_miimon_inspect(struct bo + ignore_updelay = !rcu_dereference(bond->curr_active_slave); + + bond_for_each_slave_rcu(bond, slave, iter) { +- slave->new_link = BOND_LINK_NOCHANGE; +- slave->link_new_state = slave->link; ++ bond_propose_link_state(slave, BOND_LINK_NOCHANGE); + + link_state = bond_check_dev_link(bond, slave->dev, 0); + +@@ -2111,7 +2110,7 @@ static int bond_miimon_inspect(struct bo + } + + if (slave->delay <= 0) { +- slave->new_link = BOND_LINK_DOWN; ++ bond_propose_link_state(slave, BOND_LINK_DOWN); + commit++; + continue; + } +@@ -2150,7 +2149,7 @@ static int bond_miimon_inspect(struct bo + slave->delay = 0; + + if (slave->delay <= 0) { +- slave->new_link = BOND_LINK_UP; ++ bond_propose_link_state(slave, BOND_LINK_UP); + commit++; + ignore_updelay = false; + continue; +@@ -2188,7 +2187,7 @@ static void bond_miimon_commit(struct bo + struct slave *slave, *primary; + + bond_for_each_slave(bond, slave, iter) { +- switch (slave->new_link) { ++ switch (slave->link_new_state) { + case BOND_LINK_NOCHANGE: + /* For 802.3ad mode, check current slave speed and + * duplex again in case its port was disabled after +@@ -2263,8 +2262,8 @@ static void bond_miimon_commit(struct bo + + default: + netdev_err(bond->dev, "invalid new link %d on slave %s\n", +- slave->new_link, slave->dev->name); +- slave->new_link = BOND_LINK_NOCHANGE; ++ slave->link_new_state, slave->dev->name); ++ bond_propose_link_state(slave, BOND_LINK_NOCHANGE); + + continue; + } +@@ -2664,13 +2663,13 @@ static void bond_loadbalance_arp_mon(str + bond_for_each_slave_rcu(bond, slave, iter) { + unsigned long trans_start = dev_trans_start(slave->dev); + +- slave->new_link = BOND_LINK_NOCHANGE; ++ bond_propose_link_state(slave, BOND_LINK_NOCHANGE); + + if (slave->link != BOND_LINK_UP) { + if (bond_time_in_interval(bond, trans_start, 1) && + bond_time_in_interval(bond, slave->last_rx, 1)) { + +- slave->new_link = BOND_LINK_UP; ++ bond_propose_link_state(slave, BOND_LINK_UP); + slave_state_changed = 1; + + /* primary_slave has no meaning in round-robin +@@ -2697,7 +2696,7 @@ static void bond_loadbalance_arp_mon(str + if (!bond_time_in_interval(bond, trans_start, 2) || + !bond_time_in_interval(bond, slave->last_rx, 2)) { + +- slave->new_link = BOND_LINK_DOWN; ++ bond_propose_link_state(slave, BOND_LINK_DOWN); + slave_state_changed = 1; + + if (slave->link_failure_count < UINT_MAX) +@@ -2729,8 +2728,8 @@ static void bond_loadbalance_arp_mon(str + goto re_arm; + + bond_for_each_slave(bond, slave, iter) { +- if (slave->new_link != BOND_LINK_NOCHANGE) +- slave->link = slave->new_link; ++ if (slave->link_new_state != BOND_LINK_NOCHANGE) ++ slave->link = slave->link_new_state; + } + + if (slave_state_changed) { +@@ -2753,9 +2752,9 @@ re_arm: + } + + /* Called to inspect slaves for active-backup mode ARP monitor link state +- * changes. Sets new_link in slaves to specify what action should take +- * place for the slave. Returns 0 if no changes are found, >0 if changes +- * to link states must be committed. ++ * changes. Sets proposed link state in slaves to specify what action ++ * should take place for the slave. Returns 0 if no changes are found, >0 ++ * if changes to link states must be committed. + * + * Called with rcu_read_lock held. + */ +@@ -2767,12 +2766,12 @@ static int bond_ab_arp_inspect(struct bo + int commit = 0; + + bond_for_each_slave_rcu(bond, slave, iter) { +- slave->new_link = BOND_LINK_NOCHANGE; ++ bond_propose_link_state(slave, BOND_LINK_NOCHANGE); + last_rx = slave_last_rx(bond, slave); + + if (slave->link != BOND_LINK_UP) { + if (bond_time_in_interval(bond, last_rx, 1)) { +- slave->new_link = BOND_LINK_UP; ++ bond_propose_link_state(slave, BOND_LINK_UP); + commit++; + } + continue; +@@ -2800,7 +2799,7 @@ static int bond_ab_arp_inspect(struct bo + if (!bond_is_active_slave(slave) && + !rcu_access_pointer(bond->current_arp_slave) && + !bond_time_in_interval(bond, last_rx, 3)) { +- slave->new_link = BOND_LINK_DOWN; ++ bond_propose_link_state(slave, BOND_LINK_DOWN); + commit++; + } + +@@ -2813,7 +2812,7 @@ static int bond_ab_arp_inspect(struct bo + if (bond_is_active_slave(slave) && + (!bond_time_in_interval(bond, trans_start, 2) || + !bond_time_in_interval(bond, last_rx, 2))) { +- slave->new_link = BOND_LINK_DOWN; ++ bond_propose_link_state(slave, BOND_LINK_DOWN); + commit++; + } + } +@@ -2833,7 +2832,7 @@ static void bond_ab_arp_commit(struct bo + struct slave *slave; + + bond_for_each_slave(bond, slave, iter) { +- switch (slave->new_link) { ++ switch (slave->link_new_state) { + case BOND_LINK_NOCHANGE: + continue; + +@@ -2886,7 +2885,7 @@ static void bond_ab_arp_commit(struct bo + + default: + netdev_err(bond->dev, "impossible: new_link %d on slave %s\n", +- slave->new_link, slave->dev->name); ++ slave->link_new_state, slave->dev->name); + continue; + } + +--- a/include/net/bonding.h ++++ b/include/net/bonding.h +@@ -149,7 +149,6 @@ struct slave { + unsigned long target_last_arp_rx[BOND_MAX_ARP_TARGETS]; + s8 link; /* one of BOND_LINK_XXXX */ + s8 link_new_state; /* one of BOND_LINK_XXXX */ +- s8 new_link; + u8 backup:1, /* indicates backup slave. Value corresponds with + BOND_STATE_ACTIVE and BOND_STATE_BACKUP */ + inactive:1, /* indicates inactive slave */ +@@ -539,7 +538,7 @@ static inline void bond_propose_link_sta + + static inline void bond_commit_link_state(struct slave *slave, bool notify) + { +- if (slave->link == slave->link_new_state) ++ if (slave->link_new_state == BOND_LINK_NOCHANGE) + return; + + slave->link = slave->link_new_state; diff --git a/queue-4.19/cdc-ncm-handle-incomplete-transfer-of-mtu.patch b/queue-4.19/cdc-ncm-handle-incomplete-transfer-of-mtu.patch new file mode 100644 index 00000000000..fbe136f2842 --- /dev/null +++ b/queue-4.19/cdc-ncm-handle-incomplete-transfer-of-mtu.patch @@ -0,0 +1,46 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Oliver Neukum +Date: Thu, 7 Nov 2019 09:48:01 +0100 +Subject: CDC-NCM: handle incomplete transfer of MTU + +From: Oliver Neukum + +[ Upstream commit 332f989a3b0041b810836c5c3747e59aad7e9d0b ] + +A malicious device may give half an answer when asked +for its MTU. The driver will proceed after this with +a garbage MTU. Anything but a complete answer must be treated +as an error. + +V2: used sizeof as request by Alexander + +Reported-and-tested-by: syzbot+0631d878823ce2411636@syzkaller.appspotmail.com +Signed-off-by: Oliver Neukum +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/cdc_ncm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/net/usb/cdc_ncm.c ++++ b/drivers/net/usb/cdc_ncm.c +@@ -578,8 +578,8 @@ static void cdc_ncm_set_dgram_size(struc + /* read current mtu value from device */ + err = usbnet_read_cmd(dev, USB_CDC_GET_MAX_DATAGRAM_SIZE, + USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE, +- 0, iface_no, &max_datagram_size, 2); +- if (err < 0) { ++ 0, iface_no, &max_datagram_size, sizeof(max_datagram_size)); ++ if (err < sizeof(max_datagram_size)) { + dev_dbg(&dev->intf->dev, "GET_MAX_DATAGRAM_SIZE failed\n"); + goto out; + } +@@ -590,7 +590,7 @@ static void cdc_ncm_set_dgram_size(struc + max_datagram_size = cpu_to_le16(ctx->max_datagram_size); + err = usbnet_write_cmd(dev, USB_CDC_SET_MAX_DATAGRAM_SIZE, + USB_TYPE_CLASS | USB_DIR_OUT | USB_RECIP_INTERFACE, +- 0, iface_no, &max_datagram_size, 2); ++ 0, iface_no, &max_datagram_size, sizeof(max_datagram_size)); + if (err < 0) + dev_dbg(&dev->intf->dev, "SET_MAX_DATAGRAM_SIZE failed\n"); + diff --git a/queue-4.19/ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch b/queue-4.19/ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch new file mode 100644 index 00000000000..12e0bfd2ddf --- /dev/null +++ b/queue-4.19/ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch @@ -0,0 +1,35 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: David Ahern +Date: Thu, 7 Nov 2019 18:29:52 +0000 +Subject: ipv4: Fix table id reference in fib_sync_down_addr + +From: David Ahern + +[ Upstream commit e0a312629fefa943534fc46f7bfbe6de3fdaf463 ] + +Hendrik reported routes in the main table using source address are not +removed when the address is removed. The problem is that fib_sync_down_addr +does not account for devices in the default VRF which are associated +with the main table. Fix by updating the table id reference. + +Fixes: 5a56a0b3a45d ("net: Don't delete routes in different VRFs") +Reported-by: Hendrik Donner +Signed-off-by: David Ahern +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv4/fib_semantics.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/ipv4/fib_semantics.c ++++ b/net/ipv4/fib_semantics.c +@@ -1421,8 +1421,8 @@ int fib_sync_down_addr(struct net_device + int ret = 0; + unsigned int hash = fib_laddr_hashfn(local); + struct hlist_head *head = &fib_info_laddrhash[hash]; ++ int tb_id = l3mdev_fib_table(dev) ? : RT_TABLE_MAIN; + struct net *net = dev_net(dev); +- int tb_id = l3mdev_fib_table(dev); + struct fib_info *fi; + + if (!fib_info_laddrhash || local == 0) diff --git a/queue-4.19/ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch b/queue-4.19/ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch new file mode 100644 index 00000000000..bde08384e3f --- /dev/null +++ b/queue-4.19/ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch @@ -0,0 +1,128 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Eric Dumazet +Date: Thu, 7 Nov 2019 09:26:19 -0800 +Subject: ipv6: fixes rt6_probe() and fib6_nh->last_probe init + +From: Eric Dumazet + +[ Upstream commit 1bef4c223b8588cf50433bdc2c6953d82949b3b3 ] + +While looking at a syzbot KCSAN report [1], I found multiple +issues in this code : + +1) fib6_nh->last_probe has an initial value of 0. + + While probably okay on 64bit kernels, this causes an issue + on 32bit kernels since the time_after(jiffies, 0 + interval) + might be false ~24 days after boot (for HZ=1000) + +2) The data-race found by KCSAN + I could use READ_ONCE() and WRITE_ONCE(), but we also can + take the opportunity of not piling-up too many rt6_probe_deferred() + works by using instead cmpxchg() so that only one cpu wins the race. + +[1] +BUG: KCSAN: data-race in find_match / find_match + +write to 0xffff8880bb7aabe8 of 8 bytes by interrupt on cpu 1: + rt6_probe net/ipv6/route.c:663 [inline] + find_match net/ipv6/route.c:757 [inline] + find_match+0x5bd/0x790 net/ipv6/route.c:733 + __find_rr_leaf+0xe3/0x780 net/ipv6/route.c:831 + find_rr_leaf net/ipv6/route.c:852 [inline] + rt6_select net/ipv6/route.c:896 [inline] + fib6_table_lookup+0x383/0x650 net/ipv6/route.c:2164 + ip6_pol_route+0xee/0x5c0 net/ipv6/route.c:2200 + ip6_pol_route_output+0x48/0x60 net/ipv6/route.c:2452 + fib6_rule_lookup+0x3d6/0x470 net/ipv6/fib6_rules.c:117 + ip6_route_output_flags_noref+0x16b/0x230 net/ipv6/route.c:2484 + ip6_route_output_flags+0x50/0x1a0 net/ipv6/route.c:2497 + ip6_dst_lookup_tail+0x25d/0xc30 net/ipv6/ip6_output.c:1049 + ip6_dst_lookup_flow+0x68/0x120 net/ipv6/ip6_output.c:1150 + inet6_csk_route_socket+0x2f7/0x420 net/ipv6/inet6_connection_sock.c:106 + inet6_csk_xmit+0x91/0x1f0 net/ipv6/inet6_connection_sock.c:121 + __tcp_transmit_skb+0xe81/0x1d60 net/ipv4/tcp_output.c:1169 + tcp_transmit_skb net/ipv4/tcp_output.c:1185 [inline] + tcp_xmit_probe_skb+0x19b/0x1d0 net/ipv4/tcp_output.c:3735 + +read to 0xffff8880bb7aabe8 of 8 bytes by interrupt on cpu 0: + rt6_probe net/ipv6/route.c:657 [inline] + find_match net/ipv6/route.c:757 [inline] + find_match+0x521/0x790 net/ipv6/route.c:733 + __find_rr_leaf+0xe3/0x780 net/ipv6/route.c:831 + find_rr_leaf net/ipv6/route.c:852 [inline] + rt6_select net/ipv6/route.c:896 [inline] + fib6_table_lookup+0x383/0x650 net/ipv6/route.c:2164 + ip6_pol_route+0xee/0x5c0 net/ipv6/route.c:2200 + ip6_pol_route_output+0x48/0x60 net/ipv6/route.c:2452 + fib6_rule_lookup+0x3d6/0x470 net/ipv6/fib6_rules.c:117 + ip6_route_output_flags_noref+0x16b/0x230 net/ipv6/route.c:2484 + ip6_route_output_flags+0x50/0x1a0 net/ipv6/route.c:2497 + ip6_dst_lookup_tail+0x25d/0xc30 net/ipv6/ip6_output.c:1049 + ip6_dst_lookup_flow+0x68/0x120 net/ipv6/ip6_output.c:1150 + inet6_csk_route_socket+0x2f7/0x420 net/ipv6/inet6_connection_sock.c:106 + inet6_csk_xmit+0x91/0x1f0 net/ipv6/inet6_connection_sock.c:121 + __tcp_transmit_skb+0xe81/0x1d60 net/ipv4/tcp_output.c:1169 + +Reported by Kernel Concurrency Sanitizer on: +CPU: 0 PID: 18894 Comm: udevd Not tainted 5.4.0-rc3+ #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 + +Fixes: cc3a86c802f0 ("ipv6: Change rt6_probe to take a fib6_nh") +Fixes: f547fac624be ("ipv6: rate-limit probes for neighbourless routes") +Signed-off-by: Eric Dumazet +Reported-by: syzbot +Reviewed-by: David Ahern +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv6/route.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -521,6 +521,7 @@ static void rt6_probe(struct fib6_info * + { + struct __rt6_probe_work *work = NULL; + const struct in6_addr *nh_gw; ++ unsigned long last_probe; + struct neighbour *neigh; + struct net_device *dev; + struct inet6_dev *idev; +@@ -539,6 +540,7 @@ static void rt6_probe(struct fib6_info * + nh_gw = &rt->fib6_nh.nh_gw; + dev = rt->fib6_nh.nh_dev; + rcu_read_lock_bh(); ++ last_probe = READ_ONCE(rt->last_probe); + idev = __in6_dev_get(dev); + neigh = __ipv6_neigh_lookup_noref(dev, nh_gw); + if (neigh) { +@@ -554,13 +556,15 @@ static void rt6_probe(struct fib6_info * + __neigh_set_probe_once(neigh); + } + write_unlock(&neigh->lock); +- } else if (time_after(jiffies, rt->last_probe + ++ } else if (time_after(jiffies, last_probe + + idev->cnf.rtr_probe_interval)) { + work = kmalloc(sizeof(*work), GFP_ATOMIC); + } + +- if (work) { +- rt->last_probe = jiffies; ++ if (!work || cmpxchg(&rt->last_probe, ++ last_probe, jiffies) != last_probe) { ++ kfree(work); ++ } else { + INIT_WORK(&work->work, rt6_probe_deferred); + work->target = *nh_gw; + dev_hold(dev); +@@ -3066,6 +3070,9 @@ static struct fib6_info *ip6_route_info_ + if (!rt) + goto out; + ++#ifdef CONFIG_IPV6_ROUTER_PREF ++ rt->last_probe = jiffies; ++#endif + if (cfg->fc_flags & RTF_ADDRCONF) + rt->dst_nocount = true; + diff --git a/queue-4.19/net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch b/queue-4.19/net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch new file mode 100644 index 00000000000..6fbf951de35 --- /dev/null +++ b/queue-4.19/net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch @@ -0,0 +1,31 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Alexander Sverdlin +Date: Fri, 8 Nov 2019 10:00:44 +0000 +Subject: net: ethernet: octeon_mgmt: Account for second possible VLAN header + +From: Alexander Sverdlin + +[ Upstream commit e4dd5608033efe7b6030cde359bfdbaeb73bc22d ] + +Octeon's input ring-buffer entry has 14 bits-wide size field, so to account +for second possible VLAN header max_mtu must be further reduced. + +Fixes: 109cc16526c6d ("ethernet/cavium: use core min/max MTU checking") +Signed-off-by: Alexander Sverdlin +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c ++++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +@@ -1495,7 +1495,7 @@ static int octeon_mgmt_probe(struct plat + netdev->ethtool_ops = &octeon_mgmt_ethtool_ops; + + netdev->min_mtu = 64 - OCTEON_MGMT_RX_HEADROOM; +- netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM; ++ netdev->max_mtu = 16383 - OCTEON_MGMT_RX_HEADROOM - VLAN_HLEN; + + mac = of_get_mac_address(pdev->dev.of_node); + diff --git a/queue-4.19/net-fix-data-race-in-neigh_event_send.patch b/queue-4.19/net-fix-data-race-in-neigh_event_send.patch new file mode 100644 index 00000000000..a41dd31c4f1 --- /dev/null +++ b/queue-4.19/net-fix-data-race-in-neigh_event_send.patch @@ -0,0 +1,86 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Eric Dumazet +Date: Thu, 7 Nov 2019 20:08:19 -0800 +Subject: net: fix data-race in neigh_event_send() + +From: Eric Dumazet + +[ Upstream commit 1b53d64435d56902fc234ff2507142d971a09687 ] + +KCSAN reported the following data-race [1] + +The fix will also prevent the compiler from optimizing out +the condition. + +[1] + +BUG: KCSAN: data-race in neigh_resolve_output / neigh_resolve_output + +write to 0xffff8880a41dba78 of 8 bytes by interrupt on cpu 1: + neigh_event_send include/net/neighbour.h:443 [inline] + neigh_resolve_output+0x78/0x480 net/core/neighbour.c:1474 + neigh_output include/net/neighbour.h:511 [inline] + ip_finish_output2+0x4af/0xe40 net/ipv4/ip_output.c:228 + __ip_finish_output net/ipv4/ip_output.c:308 [inline] + __ip_finish_output+0x23a/0x490 net/ipv4/ip_output.c:290 + ip_finish_output+0x41/0x160 net/ipv4/ip_output.c:318 + NF_HOOK_COND include/linux/netfilter.h:294 [inline] + ip_output+0xdf/0x210 net/ipv4/ip_output.c:432 + dst_output include/net/dst.h:436 [inline] + ip_local_out+0x74/0x90 net/ipv4/ip_output.c:125 + __ip_queue_xmit+0x3a8/0xa40 net/ipv4/ip_output.c:532 + ip_queue_xmit+0x45/0x60 include/net/ip.h:237 + __tcp_transmit_skb+0xe81/0x1d60 net/ipv4/tcp_output.c:1169 + tcp_transmit_skb net/ipv4/tcp_output.c:1185 [inline] + __tcp_retransmit_skb+0x4bd/0x15f0 net/ipv4/tcp_output.c:2976 + tcp_retransmit_skb+0x36/0x1a0 net/ipv4/tcp_output.c:2999 + tcp_retransmit_timer+0x719/0x16d0 net/ipv4/tcp_timer.c:515 + tcp_write_timer_handler+0x42d/0x510 net/ipv4/tcp_timer.c:598 + tcp_write_timer+0xd1/0xf0 net/ipv4/tcp_timer.c:618 + +read to 0xffff8880a41dba78 of 8 bytes by interrupt on cpu 0: + neigh_event_send include/net/neighbour.h:442 [inline] + neigh_resolve_output+0x57/0x480 net/core/neighbour.c:1474 + neigh_output include/net/neighbour.h:511 [inline] + ip_finish_output2+0x4af/0xe40 net/ipv4/ip_output.c:228 + __ip_finish_output net/ipv4/ip_output.c:308 [inline] + __ip_finish_output+0x23a/0x490 net/ipv4/ip_output.c:290 + ip_finish_output+0x41/0x160 net/ipv4/ip_output.c:318 + NF_HOOK_COND include/linux/netfilter.h:294 [inline] + ip_output+0xdf/0x210 net/ipv4/ip_output.c:432 + dst_output include/net/dst.h:436 [inline] + ip_local_out+0x74/0x90 net/ipv4/ip_output.c:125 + __ip_queue_xmit+0x3a8/0xa40 net/ipv4/ip_output.c:532 + ip_queue_xmit+0x45/0x60 include/net/ip.h:237 + __tcp_transmit_skb+0xe81/0x1d60 net/ipv4/tcp_output.c:1169 + tcp_transmit_skb net/ipv4/tcp_output.c:1185 [inline] + __tcp_retransmit_skb+0x4bd/0x15f0 net/ipv4/tcp_output.c:2976 + tcp_retransmit_skb+0x36/0x1a0 net/ipv4/tcp_output.c:2999 + tcp_retransmit_timer+0x719/0x16d0 net/ipv4/tcp_timer.c:515 + tcp_write_timer_handler+0x42d/0x510 net/ipv4/tcp_timer.c:598 + +Reported by Kernel Concurrency Sanitizer on: +CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.0-rc3+ #0 +Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 + +Signed-off-by: Eric Dumazet +Reported-by: syzbot +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + include/net/neighbour.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h +@@ -430,8 +430,8 @@ static inline int neigh_event_send(struc + { + unsigned long now = jiffies; + +- if (neigh->used != now) +- neigh->used = now; ++ if (READ_ONCE(neigh->used) != now) ++ WRITE_ONCE(neigh->used, now); + if (!(neigh->nud_state&(NUD_CONNECTED|NUD_DELAY|NUD_PROBE))) + return __neigh_event_send(neigh, skb); + return 0; diff --git a/queue-4.19/net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch b/queue-4.19/net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch new file mode 100644 index 00000000000..e8cff602f84 --- /dev/null +++ b/queue-4.19/net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch @@ -0,0 +1,142 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Salil Mehta +Date: Thu, 7 Nov 2019 17:09:53 +0000 +Subject: net: hns: Fix the stray netpoll locks causing deadlock in NAPI path + +From: Salil Mehta + +[ Upstream commit bf5a6b4c474c589244dc25ee1af2c3c829228ef8 ] + +This patch fixes the problem of the spin locks, originally +meant for the netpoll path of hns driver, causing deadlock in +the normal NAPI poll path. The issue happened due to the presence +of the stray leftover spin lock code related to the netpoll, +whose support was earlier removed from the HNS[1], got activated +due to enabling of NET_POLL_CONTROLLER switch. + +Earlier background: +The netpoll handling code originally had this bug(as identified +by Marc Zyngier[2]) of wrong spin lock API being used which did +not disable the interrupts and hence could cause locking issues. +i.e. if the lock were first acquired in context to thread like +'ip' util and this lock if ever got later acquired again in +context to the interrupt context like TX/RX (Interrupts could +always pre-empt the lock holding task and acquire the lock again) +and hence could cause deadlock. + +Proposed Solution: +1. If the netpoll was enabled in the HNS driver, which is not + right now, we could have simply used spin_[un]lock_irqsave() +2. But as netpoll is disabled, therefore, it is best to get rid + of the existing locks and stray code for now. This should + solve the problem reported by Marc. + +[1] https://git.kernel.org/torvalds/c/4bd2c03be7 +[2] https://patchwork.ozlabs.org/patch/1189139/ + +Fixes: 4bd2c03be707 ("net: hns: remove ndo_poll_controller") +Cc: lipeng +Cc: Yisen Zhuang +Cc: Eric Dumazet +Cc: David S. Miller +Reported-by: Marc Zyngier +Acked-by: Marc Zyngier +Tested-by: Marc Zyngier +Signed-off-by: Salil Mehta +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/hisilicon/hns/hnae.c | 1 - + drivers/net/ethernet/hisilicon/hns/hnae.h | 3 --- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 22 +--------------------- + 3 files changed, 1 insertion(+), 25 deletions(-) + +--- a/drivers/net/ethernet/hisilicon/hns/hnae.c ++++ b/drivers/net/ethernet/hisilicon/hns/hnae.c +@@ -203,7 +203,6 @@ hnae_init_ring(struct hnae_queue *q, str + + ring->q = q; + ring->flags = flags; +- spin_lock_init(&ring->lock); + ring->coal_param = q->handle->coal_param; + assert(!ring->desc && !ring->desc_cb && !ring->desc_dma_addr); + +--- a/drivers/net/ethernet/hisilicon/hns/hnae.h ++++ b/drivers/net/ethernet/hisilicon/hns/hnae.h +@@ -278,9 +278,6 @@ struct hnae_ring { + /* statistic */ + struct ring_stats stats; + +- /* ring lock for poll one */ +- spinlock_t lock; +- + dma_addr_t desc_dma_addr; + u32 buf_size; /* size for hnae_desc->addr, preset by AE */ + u16 desc_num; /* total number of desc */ +--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c +@@ -947,15 +947,6 @@ static int is_valid_clean_head(struct hn + return u > c ? (h > c && h <= u) : (h > c || h <= u); + } + +-/* netif_tx_lock will turn down the performance, set only when necessary */ +-#ifdef CONFIG_NET_POLL_CONTROLLER +-#define NETIF_TX_LOCK(ring) spin_lock(&(ring)->lock) +-#define NETIF_TX_UNLOCK(ring) spin_unlock(&(ring)->lock) +-#else +-#define NETIF_TX_LOCK(ring) +-#define NETIF_TX_UNLOCK(ring) +-#endif +- + /* reclaim all desc in one budget + * return error or number of desc left + */ +@@ -969,21 +960,16 @@ static int hns_nic_tx_poll_one(struct hn + int head; + int bytes, pkts; + +- NETIF_TX_LOCK(ring); +- + head = readl_relaxed(ring->io_base + RCB_REG_HEAD); + rmb(); /* make sure head is ready before touch any data */ + +- if (is_ring_empty(ring) || head == ring->next_to_clean) { +- NETIF_TX_UNLOCK(ring); ++ if (is_ring_empty(ring) || head == ring->next_to_clean) + return 0; /* no data to poll */ +- } + + if (!is_valid_clean_head(ring, head)) { + netdev_err(ndev, "wrong head (%d, %d-%d)\n", head, + ring->next_to_use, ring->next_to_clean); + ring->stats.io_err_cnt++; +- NETIF_TX_UNLOCK(ring); + return -EIO; + } + +@@ -998,8 +984,6 @@ static int hns_nic_tx_poll_one(struct hn + ring->stats.tx_pkts += pkts; + ring->stats.tx_bytes += bytes; + +- NETIF_TX_UNLOCK(ring); +- + dev_queue = netdev_get_tx_queue(ndev, ring_data->queue_index); + netdev_tx_completed_queue(dev_queue, pkts, bytes); + +@@ -1059,16 +1043,12 @@ static void hns_nic_tx_clr_all_bufs(stru + int head; + int bytes, pkts; + +- NETIF_TX_LOCK(ring); +- + head = ring->next_to_use; /* ntu :soft setted ring position*/ + bytes = 0; + pkts = 0; + while (head != ring->next_to_clean) + hns_nic_reclaim_one_desc(ring, &bytes, &pkts); + +- NETIF_TX_UNLOCK(ring); +- + dev_queue = netdev_get_tx_queue(ndev, ring_data->queue_index); + netdev_tx_reset_queue(dev_queue); + } diff --git a/queue-4.19/net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch b/queue-4.19/net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch new file mode 100644 index 00000000000..d50b811e0f4 --- /dev/null +++ b/queue-4.19/net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch @@ -0,0 +1,47 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Claudiu Manoil +Date: Tue, 5 Nov 2019 23:50:13 +0200 +Subject: net: mscc: ocelot: don't handle netdev events for other netdevs + +From: Claudiu Manoil + +[ Upstream commit 7afb3e575e5aa9f5a200a3eb3f45d8130f6d6601 ] + +The check that the event is actually for this device should be moved +from the "port" handler to the net device handler. + +Otherwise the port handler will deny bonding configuration for other +net devices in the same system (like enetc in the LS1028A) that don't +have the lag_upper_info->tx_type restriction that ocelot has. + +Fixes: dc96ee3730fc ("net: mscc: ocelot: add bonding support") +Signed-off-by: Claudiu Manoil +Signed-off-by: Vladimir Oltean +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/mscc/ocelot.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/mscc/ocelot.c ++++ b/drivers/net/ethernet/mscc/ocelot.c +@@ -1506,9 +1506,6 @@ static int ocelot_netdevice_port_event(s + struct ocelot_port *ocelot_port = netdev_priv(dev); + int err = 0; + +- if (!ocelot_netdevice_dev_check(dev)) +- return 0; +- + switch (event) { + case NETDEV_CHANGEUPPER: + if (netif_is_bridge_master(info->upper_dev)) { +@@ -1545,6 +1542,9 @@ static int ocelot_netdevice_event(struct + struct net_device *dev = netdev_notifier_info_to_dev(ptr); + int ret = 0; + ++ if (!ocelot_netdevice_dev_check(dev)) ++ return 0; ++ + if (event == NETDEV_PRECHANGEUPPER && + netif_is_lag_master(info->upper_dev)) { + struct netdev_lag_upper_info *lag_upper_info = info->upper_info; diff --git a/queue-4.19/net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch b/queue-4.19/net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch new file mode 100644 index 00000000000..f60aa81fd84 --- /dev/null +++ b/queue-4.19/net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch @@ -0,0 +1,32 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Claudiu Manoil +Date: Tue, 5 Nov 2019 23:50:14 +0200 +Subject: net: mscc: ocelot: fix NULL pointer on LAG slave removal + +From: Claudiu Manoil + +[ Upstream commit 3b3eed8eec47259939ee6c3d58aea1c311ddee3b ] + +lag_upper_info may be NULL on slave removal. + +Fixes: dc96ee3730fc ("net: mscc: ocelot: add bonding support") +Signed-off-by: Claudiu Manoil +Signed-off-by: Vladimir Oltean +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/mscc/ocelot.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/mscc/ocelot.c ++++ b/drivers/net/ethernet/mscc/ocelot.c +@@ -1550,7 +1550,8 @@ static int ocelot_netdevice_event(struct + struct netdev_lag_upper_info *lag_upper_info = info->upper_info; + struct netlink_ext_ack *extack; + +- if (lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) { ++ if (lag_upper_info && ++ lag_upper_info->tx_type != NETDEV_LAG_TX_TYPE_HASH) { + extack = netdev_notifier_info_to_extack(&info->info); + NL_SET_ERR_MSG_MOD(extack, "LAG device using unsupported Tx type"); + diff --git a/queue-4.19/net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch b/queue-4.19/net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch new file mode 100644 index 00000000000..f4132aaf9fd --- /dev/null +++ b/queue-4.19/net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch @@ -0,0 +1,45 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Sean Tranchetti +Date: Mon, 4 Nov 2019 17:54:22 -0700 +Subject: net: qualcomm: rmnet: Fix potential UAF when unregistering + +From: Sean Tranchetti + +[ Upstream commit e7a86c687e64ab24f88330ad24ecc9442ce40c5a ] + +During the exit/unregistration process of the RmNet driver, the function +rmnet_unregister_real_device() is called to handle freeing the driver's +internal state and removing the RX handler on the underlying physical +device. However, the order of operations this function performs is wrong +and can lead to a use after free of the rmnet_port structure. + +Before calling netdev_rx_handler_unregister(), this port structure is +freed with kfree(). If packets are received on any RmNet devices before +synchronize_net() completes, they will attempt to use this already-freed +port structure when processing the packet. As such, before cleaning up any +other internal state, the RX handler must be unregistered in order to +guarantee that no further packets will arrive on the device. + +Fixes: ceed73a2cf4a ("drivers: net: ethernet: qualcomm: rmnet: Initial implementation") +Signed-off-by: Sean Tranchetti +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c ++++ b/drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c +@@ -66,10 +66,10 @@ static int rmnet_unregister_real_device( + if (port->nr_rmnet_devs) + return -EINVAL; + +- kfree(port); +- + netdev_rx_handler_unregister(real_dev); + ++ kfree(port); ++ + /* release reference on real_dev */ + dev_put(real_dev); + diff --git a/queue-4.19/net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch b/queue-4.19/net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch new file mode 100644 index 00000000000..b69335d80b5 --- /dev/null +++ b/queue-4.19/net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch @@ -0,0 +1,43 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Aleksander Morgado +Date: Thu, 7 Nov 2019 11:57:01 +0100 +Subject: net: usb: qmi_wwan: add support for DW5821e with eSIM support + +From: Aleksander Morgado + +[ Upstream commit e497df686e8fed8c1dd69179010656362858edb3 ] + +Exactly same layout as the default DW5821e module, just a different +vid/pid. + +The QMI interface is exposed in USB configuration #1: + +P: Vendor=413c ProdID=81e0 Rev=03.18 +S: Manufacturer=Dell Inc. +S: Product=DW5821e-eSIM Snapdragon X20 LTE +S: SerialNumber=0123456789ABCDEF +C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA +I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid +I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option + +Signed-off-by: Aleksander Morgado +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/qmi_wwan.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/usb/qmi_wwan.c ++++ b/drivers/net/usb/qmi_wwan.c +@@ -1297,6 +1297,7 @@ static const struct usb_device_id produc + {QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */ + {QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */ + {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ ++ {QMI_FIXED_INTF(0x413c, 0x81e0, 0)}, /* Dell Wireless 5821e with eSIM support*/ + {QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)}, /* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */ + {QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */ + {QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */ diff --git a/queue-4.19/nfc-fdp-fix-incorrect-free-object.patch b/queue-4.19/nfc-fdp-fix-incorrect-free-object.patch new file mode 100644 index 00000000000..15b607d1718 --- /dev/null +++ b/queue-4.19/nfc-fdp-fix-incorrect-free-object.patch @@ -0,0 +1,31 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Pan Bian +Date: Tue, 5 Nov 2019 16:34:07 +0800 +Subject: NFC: fdp: fix incorrect free object + +From: Pan Bian + +[ Upstream commit 517ce4e93368938b204451285e53014549804868 ] + +The address of fw_vsc_cfg is on stack. Releasing it with devm_kfree() is +incorrect, which may result in a system crash or other security impacts. +The expected object to free is *fw_vsc_cfg. + +Signed-off-by: Pan Bian +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nfc/fdp/i2c.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nfc/fdp/i2c.c ++++ b/drivers/nfc/fdp/i2c.c +@@ -267,7 +267,7 @@ static void fdp_nci_i2c_read_device_prop + *fw_vsc_cfg, len); + + if (r) { +- devm_kfree(dev, fw_vsc_cfg); ++ devm_kfree(dev, *fw_vsc_cfg); + goto vsc_read_err; + } + } else { diff --git a/queue-4.19/nfc-netlink-fix-double-device-reference-drop.patch b/queue-4.19/nfc-netlink-fix-double-device-reference-drop.patch new file mode 100644 index 00000000000..a7868a02c18 --- /dev/null +++ b/queue-4.19/nfc-netlink-fix-double-device-reference-drop.patch @@ -0,0 +1,41 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Pan Bian +Date: Thu, 7 Nov 2019 14:29:50 +0800 +Subject: nfc: netlink: fix double device reference drop + +From: Pan Bian + +[ Upstream commit 025ec40b81d785a98f76b8bdb509ac10773b4f12 ] + +The function nfc_put_device(dev) is called twice to drop the reference +to dev when there is no associated local llcp. Remove one of them to fix +the bug. + +Fixes: 52feb444a903 ("NFC: Extend netlink interface for LTO, RW, and MIUX parameters support") +Fixes: d9b8d8e19b07 ("NFC: llcp: Service Name Lookup netlink interface") +Signed-off-by: Pan Bian +Reviewed-by: Johan Hovold +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/nfc/netlink.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/net/nfc/netlink.c ++++ b/net/nfc/netlink.c +@@ -1110,7 +1110,6 @@ static int nfc_genl_llc_set_params(struc + + local = nfc_llcp_find_local(dev); + if (!local) { +- nfc_put_device(dev); + rc = -ENODEV; + goto exit; + } +@@ -1170,7 +1169,6 @@ static int nfc_genl_llc_sdreq(struct sk_ + + local = nfc_llcp_find_local(dev); + if (!local) { +- nfc_put_device(dev); + rc = -ENODEV; + goto exit; + } diff --git a/queue-4.19/nfc-st21nfca-fix-double-free.patch b/queue-4.19/nfc-st21nfca-fix-double-free.patch new file mode 100644 index 00000000000..96d610cd174 --- /dev/null +++ b/queue-4.19/nfc-st21nfca-fix-double-free.patch @@ -0,0 +1,31 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Pan Bian +Date: Thu, 7 Nov 2019 09:33:20 +0800 +Subject: NFC: st21nfca: fix double free + +From: Pan Bian + +[ Upstream commit 99a8efbb6e30b72ac98cecf81103f847abffb1e5 ] + +The variable nfcid_skb is not changed in the callee nfc_hci_get_param() +if error occurs. Consequently, the freed variable nfcid_skb will be +freed again, resulting in a double free bug. Set nfcid_skb to NULL after +releasing it to fix the bug. + +Signed-off-by: Pan Bian +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/nfc/st21nfca/core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/nfc/st21nfca/core.c ++++ b/drivers/nfc/st21nfca/core.c +@@ -719,6 +719,7 @@ static int st21nfca_hci_complete_target_ + NFC_PROTO_FELICA_MASK; + } else { + kfree_skb(nfcid_skb); ++ nfcid_skb = NULL; + /* P2P in type A */ + r = nfc_hci_get_param(hdev, ST21NFCA_RF_READER_F_GATE, + ST21NFCA_RF_READER_F_NFCID1, diff --git a/queue-4.19/qede-fix-null-pointer-deref-in-__qede_remove.patch b/queue-4.19/qede-fix-null-pointer-deref-in-__qede_remove.patch new file mode 100644 index 00000000000..93c27af19c8 --- /dev/null +++ b/queue-4.19/qede-fix-null-pointer-deref-in-__qede_remove.patch @@ -0,0 +1,101 @@ +From foo@baz Sun 10 Nov 2019 11:42:43 AM CET +From: Manish Chopra +Date: Fri, 8 Nov 2019 02:42:30 -0800 +Subject: qede: fix NULL pointer deref in __qede_remove() + +From: Manish Chopra + +[ Upstream commit deabc87111c690097c03765ea017cd500f7376fc ] + +While rebooting the system with SR-IOV vfs enabled leads +to below crash due to recurrence of __qede_remove() on the VF +devices (first from .shutdown() flow of the VF itself and +another from PF's .shutdown() flow executing pci_disable_sriov()) + +This patch adds a safeguard in __qede_remove() flow to fix this, +so that driver doesn't attempt to remove "already removed" devices. + +[ 194.360134] BUG: unable to handle kernel NULL pointer dereference at 00000000000008dc +[ 194.360227] IP: [] __qede_remove+0x24/0x130 [qede] +[ 194.360304] PGD 0 +[ 194.360325] Oops: 0000 [#1] SMP +[ 194.360360] Modules linked in: tcp_lp fuse tun bridge stp llc devlink bonding ip_set nfnetlink ib_isert iscsi_target_mod ib_srpt target_core_mod ib_srp scsi_transport_srp scsi_tgt ib_ipoib ib_umad rpcrdma sunrpc rdma_ucm ib_uverbs ib_iser rdma_cm iw_cm ib_cm libiscsi scsi_transport_iscsi dell_smbios iTCO_wdt iTCO_vendor_support dell_wmi_descriptor dcdbas vfat fat pcc_cpufreq skx_edac intel_powerclamp coretemp intel_rapl iosf_mbi kvm_intel kvm irqbypass crc32_pclmul ghash_clmulni_intel aesni_intel lrw gf128mul glue_helper ablk_helper cryptd qedr ib_core pcspkr ses enclosure joydev ipmi_ssif sg i2c_i801 lpc_ich mei_me mei wmi ipmi_si ipmi_devintf ipmi_msghandler tpm_crb acpi_pad acpi_power_meter xfs libcrc32c sd_mod crc_t10dif crct10dif_generic crct10dif_pclmul crct10dif_common crc32c_intel mgag200 +[ 194.361044] qede i2c_algo_bit drm_kms_helper qed syscopyarea sysfillrect nvme sysimgblt fb_sys_fops ttm nvme_core mpt3sas crc8 ptp drm pps_core ahci raid_class scsi_transport_sas libahci libata drm_panel_orientation_quirks nfit libnvdimm dm_mirror dm_region_hash dm_log dm_mod [last unloaded: ip_tables] +[ 194.361297] CPU: 51 PID: 7996 Comm: reboot Kdump: loaded Not tainted 3.10.0-1062.el7.x86_64 #1 +[ 194.361359] Hardware name: Dell Inc. PowerEdge MX840c/0740HW, BIOS 2.4.6 10/15/2019 +[ 194.361412] task: ffff9cea9b360000 ti: ffff9ceabebdc000 task.ti: ffff9ceabebdc000 +[ 194.361463] RIP: 0010:[] [] __qede_remove+0x24/0x130 [qede] +[ 194.361534] RSP: 0018:ffff9ceabebdfac0 EFLAGS: 00010282 +[ 194.361570] RAX: 0000000000000000 RBX: ffff9cd013846098 RCX: 0000000000000000 +[ 194.361621] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9cd013846098 +[ 194.361668] RBP: ffff9ceabebdfae8 R08: 0000000000000000 R09: 0000000000000000 +[ 194.361715] R10: 00000000bfe14201 R11: ffff9ceabfe141e0 R12: 0000000000000000 +[ 194.361762] R13: ffff9cd013846098 R14: 0000000000000000 R15: ffff9ceab5e48000 +[ 194.361810] FS: 00007f799c02d880(0000) GS:ffff9ceacb0c0000(0000) knlGS:0000000000000000 +[ 194.361865] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 194.361903] CR2: 00000000000008dc CR3: 0000001bdac76000 CR4: 00000000007607e0 +[ 194.361953] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +[ 194.362002] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +[ 194.362051] PKRU: 55555554 +[ 194.362073] Call Trace: +[ 194.362109] [] qede_remove+0x10/0x20 [qede] +[ 194.362180] [] pci_device_remove+0x3e/0xc0 +[ 194.362240] [] __device_release_driver+0x82/0xf0 +[ 194.362285] [] device_release_driver+0x23/0x30 +[ 194.362343] [] pci_stop_bus_device+0x84/0xa0 +[ 194.362388] [] pci_stop_and_remove_bus_device+0x12/0x20 +[ 194.362450] [] pci_iov_remove_virtfn+0xaf/0x160 +[ 194.362496] [] sriov_disable+0x3c/0xf0 +[ 194.362534] [] pci_disable_sriov+0x23/0x30 +[ 194.362599] [] qed_sriov_disable+0x5e3/0x650 [qed] +[ 194.362658] [] ? kfree+0x106/0x140 +[ 194.362709] [] ? qed_free_stream_mem+0x70/0x90 [qed] +[ 194.362754] [] ? kfree+0x106/0x140 +[ 194.362803] [] qed_slowpath_stop+0x1a9/0x1d0 [qed] +[ 194.362854] [] __qede_remove+0xae/0x130 [qede] +[ 194.362904] [] qede_shutdown+0x10/0x20 [qede] +[ 194.362956] [] pci_device_shutdown+0x3a/0x60 +[ 194.363010] [] device_shutdown+0xfb/0x1f0 +[ 194.363066] [] kernel_restart_prepare+0x36/0x40 +[ 194.363107] [] kernel_restart+0x12/0x60 +[ 194.363146] [] SYSC_reboot+0x229/0x260 +[ 194.363196] [] ? handle_mm_fault+0x39d/0x9b0 +[ 194.363253] [] ? __switch_to+0x151/0x580 +[ 194.363304] [] ? __schedule+0x448/0x9c0 +[ 194.363343] [] SyS_reboot+0xe/0x10 +[ 194.363387] [] system_call_fastpath+0x25/0x2a +[ 194.363430] Code: f9 e9 37 ff ff ff 90 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 55 4c 8d af 98 00 00 00 41 54 4c 89 ef 41 89 f4 53 e8 4c e4 55 f9 <80> b8 dc 08 00 00 01 48 89 c3 4c 8d b8 c0 08 00 00 4c 8b b0 c0 +[ 194.363712] RIP [] __qede_remove+0x24/0x130 [qede] +[ 194.363764] RSP +[ 194.363791] CR2: 00000000000008dc + +Signed-off-by: Manish Chopra +Signed-off-by: Ariel Elior +Signed-off-by: Sudarsana Kalluru +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/qlogic/qede/qede_main.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/qlogic/qede/qede_main.c ++++ b/drivers/net/ethernet/qlogic/qede/qede_main.c +@@ -1170,8 +1170,16 @@ enum qede_remove_mode { + static void __qede_remove(struct pci_dev *pdev, enum qede_remove_mode mode) + { + struct net_device *ndev = pci_get_drvdata(pdev); +- struct qede_dev *edev = netdev_priv(ndev); +- struct qed_dev *cdev = edev->cdev; ++ struct qede_dev *edev; ++ struct qed_dev *cdev; ++ ++ if (!ndev) { ++ dev_info(&pdev->dev, "Device has already been removed\n"); ++ return; ++ } ++ ++ edev = netdev_priv(ndev); ++ cdev = edev->cdev; + + DP_INFO(edev, "Starting qede_remove\n"); + diff --git a/queue-4.19/series b/queue-4.19/series new file mode 100644 index 00000000000..aa141f71b64 --- /dev/null +++ b/queue-4.19/series @@ -0,0 +1,15 @@ +bonding-fix-state-transition-issue-in-link-monitoring.patch +cdc-ncm-handle-incomplete-transfer-of-mtu.patch +ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch +net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch +net-fix-data-race-in-neigh_event_send.patch +net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch +net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch +nfc-fdp-fix-incorrect-free-object.patch +nfc-netlink-fix-double-device-reference-drop.patch +nfc-st21nfca-fix-double-free.patch +qede-fix-null-pointer-deref-in-__qede_remove.patch +net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch +net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch +ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch +net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch diff --git a/queue-5.3/series b/queue-5.3/series new file mode 100644 index 00000000000..9413dbc7d4e --- /dev/null +++ b/queue-5.3/series @@ -0,0 +1,24 @@ +bonding-fix-state-transition-issue-in-link-monitoring.patch +cdc-ncm-handle-incomplete-transfer-of-mtu.patch +ipv4-fix-table-id-reference-in-fib_sync_down_addr.patch +net-ethernet-octeon_mgmt-account-for-second-possible-vlan-header.patch +net-fix-data-race-in-neigh_event_send.patch +net-qualcomm-rmnet-fix-potential-uaf-when-unregistering.patch +net-tls-fix-sk_msg-trim-on-fallback-to-copy-mode.patch +net-usb-qmi_wwan-add-support-for-dw5821e-with-esim-support.patch +nfc-fdp-fix-incorrect-free-object.patch +nfc-netlink-fix-double-device-reference-drop.patch +nfc-st21nfca-fix-double-free.patch +qede-fix-null-pointer-deref-in-__qede_remove.patch +net-mscc-ocelot-don-t-handle-netdev-events-for-other-netdevs.patch +net-mscc-ocelot-fix-null-pointer-on-lag-slave-removal.patch +net-tls-don-t-pay-attention-to-sk_write_pending-when-pushing-partial-records.patch +net-tls-add-a-tx-lock.patch +selftests-tls-add-test-for-concurrent-recv-and-send.patch +ipv6-fixes-rt6_probe-and-fib6_nh-last_probe-init.patch +net-hns-fix-the-stray-netpoll-locks-causing-deadlock-in-napi-path.patch +net-prevent-load-store-tearing-on-sk-sk_stamp.patch +net-sched-prevent-duplicate-flower-rules-from-tcf_proto-destroy-race.patch +net-smc-fix-ethernet-interface-refcounting.patch +vsock-virtio-fix-sock-refcnt-holding-during-the-shutdown.patch +r8169-fix-page-read-in-r8168g_mdio_read.patch -- 2.47.3