From: Greg Kroah-Hartman Date: Sat, 17 Oct 2020 10:47:39 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.4.241~66 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74a1d2a485fe32341012ae0a6f76ee349a8be3b1;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: can-j1935-j1939_tp_tx_dat_new-fix-missing-initialization-of-skbcnt.patch can-m_can_platform-don-t-call-m_can_class_suspend-in-runtime-suspend.patch cxgb4-handle-4-tuple-pedit-to-nat-mode-translation.patch ibmveth-identify-ingress-large-send-packets.patch ibmveth-switch-order-of-ibmveth_helper-calls.patch ipv4-restore-flowi4_oif-update-before-call-to-xfrm_lookup_route.patch mlx4-handle-non-napi-callers-to-napi_poll.patch net-fec-fix-phy-init-after-phy_reset_after_clk_enable.patch net-fec-fix-phy_device-lookup-for-phy_reset_after_clk_enable.patch net-fix-pos-incrementment-in-ipv6_route_seq_next.patch net-ipv4-always-honour-route-mtu-during-forwarding.patch net-j1939-j1939_session_fresh_new-fix-missing-initialization-of-skbcnt.patch net-smc-fix-valid-dmbe-buffer-sizes.patch net-tls-sendfile-fails-with-ktls-offload.patch net-usb-qmi_wwan-add-cellient-mpl200-card.patch net_sched-remove-a-redundant-goto-chain-check.patch r8169-fix-data-corruption-issue-on-rtl8402.patch socket-fix-option-so_timestamping_new.patch tipc-fix-the-skb_unshare-in-tipc_buf_append.patch --- diff --git a/queue-5.4/can-j1935-j1939_tp_tx_dat_new-fix-missing-initialization-of-skbcnt.patch b/queue-5.4/can-j1935-j1939_tp_tx_dat_new-fix-missing-initialization-of-skbcnt.patch new file mode 100644 index 00000000000..1c7ce3b726a --- /dev/null +++ b/queue-5.4/can-j1935-j1939_tp_tx_dat_new-fix-missing-initialization-of-skbcnt.patch @@ -0,0 +1,37 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Cong Wang +Date: Wed, 7 Oct 2020 23:18:21 -0700 +Subject: can: j1935: j1939_tp_tx_dat_new(): fix missing initialization of skbcnt + +From: Cong Wang + +[ Upstream commit e009f95b1543e26606dca2f7e6e9f0f9174538e5 ] + +This fixes an uninit-value warning: +BUG: KMSAN: uninit-value in can_receive+0x26b/0x630 net/can/af_can.c:650 + +Reported-and-tested-by: syzbot+3f3837e61a48d32b495f@syzkaller.appspotmail.com +Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") +Cc: Robin van der Gracht +Cc: Oleksij Rempel +Cc: Pengutronix Kernel Team +Cc: Oliver Hartkopp +Cc: Marc Kleine-Budde +Signed-off-by: Cong Wang +Link: https://lore.kernel.org/r/20201008061821.24663-1-xiyou.wangcong@gmail.com +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman +--- + net/can/j1939/transport.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/can/j1939/transport.c ++++ b/net/can/j1939/transport.c +@@ -580,6 +580,7 @@ sk_buff *j1939_tp_tx_dat_new(struct j193 + skb->dev = priv->ndev; + can_skb_reserve(skb); + can_skb_prv(skb)->ifindex = priv->ndev->ifindex; ++ can_skb_prv(skb)->skbcnt = 0; + /* reserve CAN header */ + skb_reserve(skb, offsetof(struct can_frame, data)); + diff --git a/queue-5.4/can-m_can_platform-don-t-call-m_can_class_suspend-in-runtime-suspend.patch b/queue-5.4/can-m_can_platform-don-t-call-m_can_class_suspend-in-runtime-suspend.patch new file mode 100644 index 00000000000..ab231859a08 --- /dev/null +++ b/queue-5.4/can-m_can_platform-don-t-call-m_can_class_suspend-in-runtime-suspend.patch @@ -0,0 +1,42 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Lucas Stach +Date: Tue, 11 Aug 2020 10:15:44 +0200 +Subject: can: m_can_platform: don't call m_can_class_suspend in runtime suspend + +From: Lucas Stach + +[ Upstream commit 81f1f5ae8b3cbd54fdd994c9e9aacdb7b414a802 ] + + 0704c5743694 can: m_can_platform: remove unnecessary m_can_class_resume() call + +removed the m_can_class_resume() call in the runtime resume path to get +rid of a infinite recursion, so the runtime resume now only handles the device +clocks. + +Unfortunately it did not remove the complementary m_can_class_suspend() call in +the runtime suspend function, so those paths are now unbalanced, which causes +the pinctrl state to get stuck on the "sleep" state, which breaks all CAN +functionality on SoCs where this state is defined. Remove the +m_can_class_suspend() call to fix this. + +Fixes: 0704c5743694 can: m_can_platform: remove unnecessary m_can_class_resume() call +Signed-off-by: Lucas Stach +Link: https://lore.kernel.org/r/20200811081545.19921-1-l.stach@pengutronix.de +Acked-by: Dan Murphy +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/can/m_can/m_can_platform.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/net/can/m_can/m_can_platform.c ++++ b/drivers/net/can/m_can/m_can_platform.c +@@ -144,8 +144,6 @@ static int __maybe_unused m_can_runtime_ + struct net_device *ndev = dev_get_drvdata(dev); + struct m_can_classdev *mcan_class = netdev_priv(ndev); + +- m_can_class_suspend(dev); +- + clk_disable_unprepare(mcan_class->cclk); + clk_disable_unprepare(mcan_class->hclk); + diff --git a/queue-5.4/cxgb4-handle-4-tuple-pedit-to-nat-mode-translation.patch b/queue-5.4/cxgb4-handle-4-tuple-pedit-to-nat-mode-translation.patch new file mode 100644 index 00000000000..4cf4331378f --- /dev/null +++ b/queue-5.4/cxgb4-handle-4-tuple-pedit-to-nat-mode-translation.patch @@ -0,0 +1,388 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Herat Ramani +Date: Tue, 13 Oct 2020 15:01:29 +0530 +Subject: cxgb4: handle 4-tuple PEDIT to NAT mode translation + +From: Herat Ramani + +[ Upstream commit 2ef813b8f405db3f72202b6fcae40a628ab80a53 ] + +The 4-tuple NAT offload via PEDIT always overwrites all the 4-tuple +fields even if they had not been explicitly enabled. If any fields in +the 4-tuple are not enabled, then the hardware overwrites the +disabled fields with zeros, instead of ignoring them. + +So, add a parser that can translate the enabled 4-tuple PEDIT fields +to one of the NAT mode combinations supported by the hardware and +hence avoid overwriting disabled fields to 0. Any rule with +unsupported NAT mode combination is rejected. + +Signed-off-by: Herat Ramani +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 175 +++++++++++++++++-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h | 15 + + 2 files changed, 177 insertions(+), 13 deletions(-) + +--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c ++++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c +@@ -60,6 +60,89 @@ static struct ch_tc_pedit_fields pedits[ + PEDIT_FIELDS(IP6_, DST_127_96, 4, nat_lip, 12), + }; + ++static const struct cxgb4_natmode_config cxgb4_natmode_config_array[] = { ++ /* Default supported NAT modes */ ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_NONE, ++ .natmode = NAT_MODE_NONE, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_DIP, ++ .natmode = NAT_MODE_DIP, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT, ++ .natmode = NAT_MODE_DIP_DP, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT | ++ CXGB4_ACTION_NATMODE_SIP, ++ .natmode = NAT_MODE_DIP_DP_SIP, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_DPORT | ++ CXGB4_ACTION_NATMODE_SPORT, ++ .natmode = NAT_MODE_DIP_DP_SP, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_SIP | CXGB4_ACTION_NATMODE_SPORT, ++ .natmode = NAT_MODE_SIP_SP, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP | ++ CXGB4_ACTION_NATMODE_SPORT, ++ .natmode = NAT_MODE_DIP_SIP_SP, ++ }, ++ { ++ .chip = CHELSIO_T5, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP | ++ CXGB4_ACTION_NATMODE_DPORT | ++ CXGB4_ACTION_NATMODE_SPORT, ++ .natmode = NAT_MODE_ALL, ++ }, ++ /* T6+ can ignore L4 ports when they're disabled. */ ++ { ++ .chip = CHELSIO_T6, ++ .flags = CXGB4_ACTION_NATMODE_SIP, ++ .natmode = NAT_MODE_SIP_SP, ++ }, ++ { ++ .chip = CHELSIO_T6, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SPORT, ++ .natmode = NAT_MODE_DIP_DP_SP, ++ }, ++ { ++ .chip = CHELSIO_T6, ++ .flags = CXGB4_ACTION_NATMODE_DIP | CXGB4_ACTION_NATMODE_SIP, ++ .natmode = NAT_MODE_ALL, ++ }, ++}; ++ ++static void cxgb4_action_natmode_tweak(struct ch_filter_specification *fs, ++ u8 natmode_flags) ++{ ++ u8 i = 0; ++ ++ /* Translate the enabled NAT 4-tuple fields to one of the ++ * hardware supported NAT mode configurations. This ensures ++ * that we pick a valid combination, where the disabled fields ++ * do not get overwritten to 0. ++ */ ++ for (i = 0; i < ARRAY_SIZE(cxgb4_natmode_config_array); i++) { ++ if (cxgb4_natmode_config_array[i].flags == natmode_flags) { ++ fs->nat_mode = cxgb4_natmode_config_array[i].natmode; ++ return; ++ } ++ } ++} ++ + static struct ch_tc_flower_entry *allocate_flower_entry(void) + { + struct ch_tc_flower_entry *new = kzalloc(sizeof(*new), GFP_KERNEL); +@@ -287,7 +370,8 @@ static void offload_pedit(struct ch_filt + } + + static void process_pedit_field(struct ch_filter_specification *fs, u32 val, +- u32 mask, u32 offset, u8 htype) ++ u32 mask, u32 offset, u8 htype, ++ u8 *natmode_flags) + { + switch (htype) { + case FLOW_ACT_MANGLE_HDR_TYPE_ETH: +@@ -312,68 +396,104 @@ static void process_pedit_field(struct c + switch (offset) { + case PEDIT_IP4_SRC: + offload_pedit(fs, val, mask, IP4_SRC); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; + break; + case PEDIT_IP4_DST: + offload_pedit(fs, val, mask, IP4_DST); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + } +- fs->nat_mode = NAT_MODE_ALL; + break; + case FLOW_ACT_MANGLE_HDR_TYPE_IP6: + switch (offset) { + case PEDIT_IP6_SRC_31_0: + offload_pedit(fs, val, mask, IP6_SRC_31_0); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; + break; + case PEDIT_IP6_SRC_63_32: + offload_pedit(fs, val, mask, IP6_SRC_63_32); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; + break; + case PEDIT_IP6_SRC_95_64: + offload_pedit(fs, val, mask, IP6_SRC_95_64); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; + break; + case PEDIT_IP6_SRC_127_96: + offload_pedit(fs, val, mask, IP6_SRC_127_96); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; + break; + case PEDIT_IP6_DST_31_0: + offload_pedit(fs, val, mask, IP6_DST_31_0); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + break; + case PEDIT_IP6_DST_63_32: + offload_pedit(fs, val, mask, IP6_DST_63_32); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + break; + case PEDIT_IP6_DST_95_64: + offload_pedit(fs, val, mask, IP6_DST_95_64); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + break; + case PEDIT_IP6_DST_127_96: + offload_pedit(fs, val, mask, IP6_DST_127_96); ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + } +- fs->nat_mode = NAT_MODE_ALL; + break; + case FLOW_ACT_MANGLE_HDR_TYPE_TCP: + switch (offset) { + case PEDIT_TCP_SPORT_DPORT: +- if (~mask & PEDIT_TCP_UDP_SPORT_MASK) ++ if (~mask & PEDIT_TCP_UDP_SPORT_MASK) { + fs->nat_fport = val; +- else ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SPORT; ++ } else { + fs->nat_lport = val >> 16; ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DPORT; ++ } + } +- fs->nat_mode = NAT_MODE_ALL; + break; + case FLOW_ACT_MANGLE_HDR_TYPE_UDP: + switch (offset) { + case PEDIT_UDP_SPORT_DPORT: +- if (~mask & PEDIT_TCP_UDP_SPORT_MASK) ++ if (~mask & PEDIT_TCP_UDP_SPORT_MASK) { + fs->nat_fport = val; +- else ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SPORT; ++ } else { + fs->nat_lport = val >> 16; ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DPORT; ++ } + } +- fs->nat_mode = NAT_MODE_ALL; ++ break; + } + } + ++static int cxgb4_action_natmode_validate(struct net_device *dev, ++ struct adapter *adap, u8 natmode_flags) ++{ ++ u8 i = 0; ++ ++ /* Extract the NAT mode to enable based on what 4-tuple fields ++ * are enabled to be overwritten. This ensures that the ++ * disabled fields don't get overwritten to 0. ++ */ ++ for (i = 0; i < ARRAY_SIZE(cxgb4_natmode_config_array); i++) { ++ const struct cxgb4_natmode_config *c; ++ ++ c = &cxgb4_natmode_config_array[i]; ++ if (CHELSIO_CHIP_VERSION(adap->params.chip) >= c->chip && ++ natmode_flags == c->flags) ++ return 0; ++ } ++ netdev_err(dev, "%s: Unsupported NAT mode 4-tuple combination\n", ++ __func__); ++ return -EOPNOTSUPP; ++} ++ + static void cxgb4_process_flow_actions(struct net_device *in, + struct flow_cls_offload *cls, + struct ch_filter_specification *fs) + { + struct flow_rule *rule = flow_cls_offload_flow_rule(cls); + struct flow_action_entry *act; ++ u8 natmode_flags = 0; + int i; + + flow_action_for_each(i, act, &rule->action) { +@@ -424,13 +544,17 @@ static void cxgb4_process_flow_actions(s + val = act->mangle.val; + offset = act->mangle.offset; + +- process_pedit_field(fs, val, mask, offset, htype); ++ process_pedit_field(fs, val, mask, offset, htype, ++ &natmode_flags); + } + break; + default: + break; + } + } ++ if (natmode_flags) ++ cxgb4_action_natmode_tweak(fs, natmode_flags); ++ + } + + static bool valid_l4_mask(u32 mask) +@@ -447,7 +571,8 @@ static bool valid_l4_mask(u32 mask) + } + + static bool valid_pedit_action(struct net_device *dev, +- const struct flow_action_entry *act) ++ const struct flow_action_entry *act, ++ u8 *natmode_flags) + { + u32 mask, offset; + u8 htype; +@@ -472,7 +597,10 @@ static bool valid_pedit_action(struct ne + case FLOW_ACT_MANGLE_HDR_TYPE_IP4: + switch (offset) { + case PEDIT_IP4_SRC: ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; ++ break; + case PEDIT_IP4_DST: ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + break; + default: + netdev_err(dev, "%s: Unsupported pedit field\n", +@@ -486,10 +614,13 @@ static bool valid_pedit_action(struct ne + case PEDIT_IP6_SRC_63_32: + case PEDIT_IP6_SRC_95_64: + case PEDIT_IP6_SRC_127_96: ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SIP; ++ break; + case PEDIT_IP6_DST_31_0: + case PEDIT_IP6_DST_63_32: + case PEDIT_IP6_DST_95_64: + case PEDIT_IP6_DST_127_96: ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DIP; + break; + default: + netdev_err(dev, "%s: Unsupported pedit field\n", +@@ -505,6 +636,10 @@ static bool valid_pedit_action(struct ne + __func__); + return false; + } ++ if (~mask & PEDIT_TCP_UDP_SPORT_MASK) ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SPORT; ++ else ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DPORT; + break; + default: + netdev_err(dev, "%s: Unsupported pedit field\n", +@@ -520,6 +655,10 @@ static bool valid_pedit_action(struct ne + __func__); + return false; + } ++ if (~mask & PEDIT_TCP_UDP_SPORT_MASK) ++ *natmode_flags |= CXGB4_ACTION_NATMODE_SPORT; ++ else ++ *natmode_flags |= CXGB4_ACTION_NATMODE_DPORT; + break; + default: + netdev_err(dev, "%s: Unsupported pedit field\n", +@@ -538,10 +677,12 @@ static int cxgb4_validate_flow_actions(s + struct flow_cls_offload *cls) + { + struct flow_rule *rule = flow_cls_offload_flow_rule(cls); ++ struct adapter *adap = netdev2adap(dev); + struct flow_action_entry *act; + bool act_redir = false; + bool act_pedit = false; + bool act_vlan = false; ++ u8 natmode_flags = 0; + int i; + + flow_action_for_each(i, act, &rule->action) { +@@ -551,7 +692,6 @@ static int cxgb4_validate_flow_actions(s + /* Do nothing */ + break; + case FLOW_ACTION_REDIRECT: { +- struct adapter *adap = netdev2adap(dev); + struct net_device *n_dev, *target_dev; + unsigned int i; + bool found = false; +@@ -601,7 +741,8 @@ static int cxgb4_validate_flow_actions(s + } + break; + case FLOW_ACTION_MANGLE: { +- bool pedit_valid = valid_pedit_action(dev, act); ++ bool pedit_valid = valid_pedit_action(dev, act, ++ &natmode_flags); + + if (!pedit_valid) + return -EOPNOTSUPP; +@@ -620,6 +761,14 @@ static int cxgb4_validate_flow_actions(s + return -EINVAL; + } + ++ if (act_pedit) { ++ int ret; ++ ++ ret = cxgb4_action_natmode_validate(dev, adap, natmode_flags); ++ if (ret) ++ return ret; ++ } ++ + return 0; + } + +--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h ++++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.h +@@ -108,6 +108,21 @@ struct ch_tc_pedit_fields { + #define PEDIT_TCP_SPORT_DPORT 0x0 + #define PEDIT_UDP_SPORT_DPORT 0x0 + ++enum cxgb4_action_natmode_flags { ++ CXGB4_ACTION_NATMODE_NONE = 0, ++ CXGB4_ACTION_NATMODE_DIP = (1 << 0), ++ CXGB4_ACTION_NATMODE_SIP = (1 << 1), ++ CXGB4_ACTION_NATMODE_DPORT = (1 << 2), ++ CXGB4_ACTION_NATMODE_SPORT = (1 << 3), ++}; ++ ++/* TC PEDIT action to NATMODE translation entry */ ++struct cxgb4_natmode_config { ++ enum chip_type chip; ++ u8 flags; ++ u8 natmode; ++}; ++ + int cxgb4_tc_flower_replace(struct net_device *dev, + struct flow_cls_offload *cls); + int cxgb4_tc_flower_destroy(struct net_device *dev, diff --git a/queue-5.4/ibmveth-identify-ingress-large-send-packets.patch b/queue-5.4/ibmveth-identify-ingress-large-send-packets.patch new file mode 100644 index 00000000000..1751c4b7b96 --- /dev/null +++ b/queue-5.4/ibmveth-identify-ingress-large-send-packets.patch @@ -0,0 +1,57 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: David Wilder +Date: Tue, 13 Oct 2020 16:20:14 -0700 +Subject: ibmveth: Identify ingress large send packets. + +From: David Wilder + +[ Upstream commit 413f142cc05cb03f2d1ea83388e40c1ddc0d74e9 ] + +Ingress large send packets are identified by either: +The IBMVETH_RXQ_LRG_PKT flag in the receive buffer +or with a -1 placed in the ip header checksum. +The method used depends on firmware version. Frame +geometry and sufficient header validation is performed by the +hypervisor eliminating the need for further header checks here. + +Fixes: 7b5967389f5a ("ibmveth: set correct gso_size and gso_type") +Signed-off-by: David Wilder +Reviewed-by: Thomas Falcon +Reviewed-by: Cristobal Forno +Reviewed-by: Pradeep Satyanarayana +Acked-by: Willem de Bruijn +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/ibm/ibmveth.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/ibm/ibmveth.c ++++ b/drivers/net/ethernet/ibm/ibmveth.c +@@ -1317,6 +1317,7 @@ static int ibmveth_poll(struct napi_stru + int offset = ibmveth_rxq_frame_offset(adapter); + int csum_good = ibmveth_rxq_csum_good(adapter); + int lrg_pkt = ibmveth_rxq_large_packet(adapter); ++ __sum16 iph_check = 0; + + skb = ibmveth_rxq_get_buffer(adapter); + +@@ -1353,7 +1354,17 @@ static int ibmveth_poll(struct napi_stru + skb_put(skb, length); + skb->protocol = eth_type_trans(skb, netdev); + +- if (length > netdev->mtu + ETH_HLEN) { ++ /* PHYP without PLSO support places a -1 in the ip ++ * checksum for large send frames. ++ */ ++ if (skb->protocol == cpu_to_be16(ETH_P_IP)) { ++ struct iphdr *iph = (struct iphdr *)skb->data; ++ ++ iph_check = iph->check; ++ } ++ ++ if ((length > netdev->mtu + ETH_HLEN) || ++ lrg_pkt || iph_check == 0xffff) { + ibmveth_rx_mss_helper(skb, mss, lrg_pkt); + adapter->rx_large_packets++; + } diff --git a/queue-5.4/ibmveth-switch-order-of-ibmveth_helper-calls.patch b/queue-5.4/ibmveth-switch-order-of-ibmveth_helper-calls.patch new file mode 100644 index 00000000000..f658d4267c8 --- /dev/null +++ b/queue-5.4/ibmveth-switch-order-of-ibmveth_helper-calls.patch @@ -0,0 +1,48 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: David Wilder +Date: Tue, 13 Oct 2020 16:20:13 -0700 +Subject: ibmveth: Switch order of ibmveth_helper calls. + +From: David Wilder + +[ Upstream commit 5ce9ad815a296374ca21f43f3b1ab5083d202ee1 ] + +ibmveth_rx_csum_helper() must be called after ibmveth_rx_mss_helper() +as ibmveth_rx_csum_helper() may alter ip and tcp checksum values. + +Fixes: 66aa0678efc2 ("ibmveth: Support to enable LSO/CSO for Trunk VEA.") +Signed-off-by: David Wilder +Reviewed-by: Thomas Falcon +Reviewed-by: Cristobal Forno +Reviewed-by: Pradeep Satyanarayana +Acked-by: Willem de Bruijn +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/ibm/ibmveth.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/net/ethernet/ibm/ibmveth.c ++++ b/drivers/net/ethernet/ibm/ibmveth.c +@@ -1353,16 +1353,16 @@ static int ibmveth_poll(struct napi_stru + skb_put(skb, length); + skb->protocol = eth_type_trans(skb, netdev); + +- if (csum_good) { +- skb->ip_summed = CHECKSUM_UNNECESSARY; +- ibmveth_rx_csum_helper(skb, adapter); +- } +- + if (length > netdev->mtu + ETH_HLEN) { + ibmveth_rx_mss_helper(skb, mss, lrg_pkt); + adapter->rx_large_packets++; + } + ++ if (csum_good) { ++ skb->ip_summed = CHECKSUM_UNNECESSARY; ++ ibmveth_rx_csum_helper(skb, adapter); ++ } ++ + napi_gro_receive(napi, skb); /* send it up */ + + netdev->stats.rx_packets++; diff --git a/queue-5.4/ipv4-restore-flowi4_oif-update-before-call-to-xfrm_lookup_route.patch b/queue-5.4/ipv4-restore-flowi4_oif-update-before-call-to-xfrm_lookup_route.patch new file mode 100644 index 00000000000..1efb7ec6351 --- /dev/null +++ b/queue-5.4/ipv4-restore-flowi4_oif-update-before-call-to-xfrm_lookup_route.patch @@ -0,0 +1,40 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: David Ahern +Date: Fri, 9 Oct 2020 11:01:01 -0700 +Subject: ipv4: Restore flowi4_oif update before call to xfrm_lookup_route + +From: David Ahern + +[ Upstream commit 874fb9e2ca949b443cc419a4f2227cafd4381d39 ] + +Tobias reported regressions in IPsec tests following the patch +referenced by the Fixes tag below. The root cause is dropping the +reset of the flowi4_oif after the fib_lookup. Apparently it is +needed for xfrm cases, so restore the oif update to ip_route_output_flow +right before the call to xfrm_lookup_route. + +Fixes: 2fbc6e89b2f1 ("ipv4: Update exception handling for multipath routes via same device") +Reported-by: Tobias Brunner +Signed-off-by: David Ahern +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv4/route.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c +@@ -2728,10 +2728,12 @@ struct rtable *ip_route_output_flow(stru + if (IS_ERR(rt)) + return rt; + +- if (flp4->flowi4_proto) ++ if (flp4->flowi4_proto) { ++ flp4->flowi4_oif = rt->dst.dev->ifindex; + rt = (struct rtable *)xfrm_lookup_route(net, &rt->dst, + flowi4_to_flowi(flp4), + sk, 0); ++ } + + return rt; + } diff --git a/queue-5.4/mlx4-handle-non-napi-callers-to-napi_poll.patch b/queue-5.4/mlx4-handle-non-napi-callers-to-napi_poll.patch new file mode 100644 index 00000000000..c9a70c05ce3 --- /dev/null +++ b/queue-5.4/mlx4-handle-non-napi-callers-to-napi_poll.patch @@ -0,0 +1,46 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Jonathan Lemon +Date: Thu, 8 Oct 2020 11:45:26 -0700 +Subject: mlx4: handle non-napi callers to napi_poll + +From: Jonathan Lemon + +[ Upstream commit b2b8a92733b288128feb57ffa694758cf475106c ] + +netcons calls napi_poll with a budget of 0 to transmit packets. +Handle this by: + - skipping RX processing + - do not try to recycle TX packets to the RX cache + +Signed-off-by: Jonathan Lemon +Reviewed-by: Tariq Toukan +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 3 +++ + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c ++++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c +@@ -942,6 +942,9 @@ int mlx4_en_poll_rx_cq(struct napi_struc + bool clean_complete = true; + int done; + ++ if (!budget) ++ return 0; ++ + if (priv->tx_ring_num[TX_XDP]) { + xdp_tx_cq = priv->tx_cq[TX_XDP][cq->ring]; + if (xdp_tx_cq->xdp_busy) { +--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c ++++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c +@@ -350,7 +350,7 @@ u32 mlx4_en_recycle_tx_desc(struct mlx4_ + .dma = tx_info->map0_dma, + }; + +- if (!mlx4_en_rx_recycle(ring->recycle_ring, &frame)) { ++ if (!napi_mode || !mlx4_en_rx_recycle(ring->recycle_ring, &frame)) { + dma_unmap_page(priv->ddev, tx_info->map0_dma, + PAGE_SIZE, priv->dma_dir); + put_page(tx_info->page); diff --git a/queue-5.4/net-fec-fix-phy-init-after-phy_reset_after_clk_enable.patch b/queue-5.4/net-fec-fix-phy-init-after-phy_reset_after_clk_enable.patch new file mode 100644 index 00000000000..5c34323d446 --- /dev/null +++ b/queue-5.4/net-fec-fix-phy-init-after-phy_reset_after_clk_enable.patch @@ -0,0 +1,55 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Marek Vasut +Date: Tue, 6 Oct 2020 15:52:53 +0200 +Subject: net: fec: Fix PHY init after phy_reset_after_clk_enable() + +From: Marek Vasut + +[ Upstream commit 0da1ccbbefb662915228bc17e1c7d4ad28b3ddab ] + +The phy_reset_after_clk_enable() does a PHY reset, which means the PHY +loses its register settings. The fec_enet_mii_probe() starts the PHY +and does the necessary calls to configure the PHY via PHY framework, +and loads the correct register settings into the PHY. Therefore, +fec_enet_mii_probe() should be called only after the PHY has been +reset, not before as it is now. + +Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support") +Reviewed-by: Andrew Lunn +Tested-by: Richard Leitner +Signed-off-by: Marek Vasut +Cc: Christoph Niedermaier +Cc: David S. Miller +Cc: NXP Linux Team +Cc: Shawn Guo +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/freescale/fec_main.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/net/ethernet/freescale/fec_main.c ++++ b/drivers/net/ethernet/freescale/fec_main.c +@@ -3003,17 +3003,17 @@ fec_enet_open(struct net_device *ndev) + /* Init MAC prior to mii bus probe */ + fec_restart(ndev); + +- /* Probe and connect to PHY when open the interface */ +- ret = fec_enet_mii_probe(ndev); +- if (ret) +- goto err_enet_mii_probe; +- + /* Call phy_reset_after_clk_enable() again if it failed during + * phy_reset_after_clk_enable() before because the PHY wasn't probed. + */ + if (reset_again) + fec_enet_phy_reset_after_clk_enable(ndev); + ++ /* Probe and connect to PHY when open the interface */ ++ ret = fec_enet_mii_probe(ndev); ++ if (ret) ++ goto err_enet_mii_probe; ++ + if (fep->quirks & FEC_QUIRK_ERR006687) + imx6q_cpuidle_fec_irqs_used(); + diff --git a/queue-5.4/net-fec-fix-phy_device-lookup-for-phy_reset_after_clk_enable.patch b/queue-5.4/net-fec-fix-phy_device-lookup-for-phy_reset_after_clk_enable.patch new file mode 100644 index 00000000000..af49c33941d --- /dev/null +++ b/queue-5.4/net-fec-fix-phy_device-lookup-for-phy_reset_after_clk_enable.patch @@ -0,0 +1,83 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Marek Vasut +Date: Sat, 10 Oct 2020 11:10:00 +0200 +Subject: net: fec: Fix phy_device lookup for phy_reset_after_clk_enable() + +From: Marek Vasut + +[ Upstream commit 64a632da538a6827fad0ea461925cedb9899ebe2 ] + +The phy_reset_after_clk_enable() is always called with ndev->phydev, +however that pointer may be NULL even though the PHY device instance +already exists and is sufficient to perform the PHY reset. + +This condition happens in fec_open(), where the clock must be enabled +first, then the PHY must be reset, and then the PHY IDs can be read +out of the PHY. + +If the PHY still is not bound to the MAC, but there is OF PHY node +and a matching PHY device instance already, use the OF PHY node to +obtain the PHY device instance, and then use that PHY device instance +when triggering the PHY reset. + +Fixes: 1b0a83ac04e3 ("net: fec: add phy_reset_after_clk_enable() support") +Signed-off-by: Marek Vasut +Cc: Christoph Niedermaier +Cc: David S. Miller +Cc: NXP Linux Team +Cc: Richard Leitner +Cc: Shawn Guo +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/freescale/fec_main.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/freescale/fec_main.c ++++ b/drivers/net/ethernet/freescale/fec_main.c +@@ -1945,6 +1945,27 @@ out: + return ret; + } + ++static void fec_enet_phy_reset_after_clk_enable(struct net_device *ndev) ++{ ++ struct fec_enet_private *fep = netdev_priv(ndev); ++ struct phy_device *phy_dev = ndev->phydev; ++ ++ if (phy_dev) { ++ phy_reset_after_clk_enable(phy_dev); ++ } else if (fep->phy_node) { ++ /* ++ * If the PHY still is not bound to the MAC, but there is ++ * OF PHY node and a matching PHY device instance already, ++ * use the OF PHY node to obtain the PHY device instance, ++ * and then use that PHY device instance when triggering ++ * the PHY reset. ++ */ ++ phy_dev = of_phy_find_device(fep->phy_node); ++ phy_reset_after_clk_enable(phy_dev); ++ put_device(&phy_dev->mdio.dev); ++ } ++} ++ + static int fec_enet_clk_enable(struct net_device *ndev, bool enable) + { + struct fec_enet_private *fep = netdev_priv(ndev); +@@ -1971,7 +1992,7 @@ static int fec_enet_clk_enable(struct ne + if (ret) + goto failed_clk_ref; + +- phy_reset_after_clk_enable(ndev->phydev); ++ fec_enet_phy_reset_after_clk_enable(ndev); + } else { + clk_disable_unprepare(fep->clk_enet_out); + if (fep->clk_ptp) { +@@ -2991,7 +3012,7 @@ fec_enet_open(struct net_device *ndev) + * phy_reset_after_clk_enable() before because the PHY wasn't probed. + */ + if (reset_again) +- phy_reset_after_clk_enable(ndev->phydev); ++ fec_enet_phy_reset_after_clk_enable(ndev); + + if (fep->quirks & FEC_QUIRK_ERR006687) + imx6q_cpuidle_fec_irqs_used(); diff --git a/queue-5.4/net-fix-pos-incrementment-in-ipv6_route_seq_next.patch b/queue-5.4/net-fix-pos-incrementment-in-ipv6_route_seq_next.patch new file mode 100644 index 00000000000..b4707968961 --- /dev/null +++ b/queue-5.4/net-fix-pos-incrementment-in-ipv6_route_seq_next.patch @@ -0,0 +1,90 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Yonghong Song +Date: Wed, 14 Oct 2020 07:46:12 -0700 +Subject: net: fix pos incrementment in ipv6_route_seq_next + +From: Yonghong Song + +[ Upstream commit 6617dfd440149e42ce4d2be615eb31a4755f4d30 ] + +Commit 4fc427e05158 ("ipv6_route_seq_next should increase position index") +tried to fix the issue where seq_file pos is not increased +if a NULL element is returned with seq_ops->next(). See bug + https://bugzilla.kernel.org/show_bug.cgi?id=206283 +The commit effectively does: + - increase pos for all seq_ops->start() + - increase pos for all seq_ops->next() + +For ipv6_route, increasing pos for all seq_ops->next() is correct. +But increasing pos for seq_ops->start() is not correct +since pos is used to determine how many items to skip during +seq_ops->start(): + iter->skip = *pos; +seq_ops->start() just fetches the *current* pos item. +The item can be skipped only after seq_ops->show() which essentially +is the beginning of seq_ops->next(). + +For example, I have 7 ipv6 route entries, + root@arch-fb-vm1:~/net-next dd if=/proc/net/ipv6_route bs=4096 + 00000000000000000000000000000000 40 00000000000000000000000000000000 00 00000000000000000000000000000000 00000400 00000001 00000000 00000001 eth0 + fe800000000000000000000000000000 40 00000000000000000000000000000000 00 00000000000000000000000000000000 00000100 00000001 00000000 00000001 eth0 + 00000000000000000000000000000000 00 00000000000000000000000000000000 00 00000000000000000000000000000000 ffffffff 00000001 00000000 00200200 lo + 00000000000000000000000000000001 80 00000000000000000000000000000000 00 00000000000000000000000000000000 00000000 00000003 00000000 80200001 lo + fe800000000000002050e3fffebd3be8 80 00000000000000000000000000000000 00 00000000000000000000000000000000 00000000 00000002 00000000 80200001 eth0 + ff000000000000000000000000000000 08 00000000000000000000000000000000 00 00000000000000000000000000000000 00000100 00000004 00000000 00000001 eth0 + 00000000000000000000000000000000 00 00000000000000000000000000000000 00 00000000000000000000000000000000 ffffffff 00000001 00000000 00200200 lo + 0+1 records in + 0+1 records out + 1050 bytes (1.0 kB, 1.0 KiB) copied, 0.00707908 s, 148 kB/s + root@arch-fb-vm1:~/net-next + +In the above, I specify buffer size 4096, so all records can be returned +to user space with a single trip to the kernel. + +If I use buffer size 128, since each record size is 149, internally +kernel seq_read() will read 149 into its internal buffer and return the data +to user space in two read() syscalls. Then user read() syscall will trigger +next seq_ops->start(). Since the current implementation increased pos even +for seq_ops->start(), it will skip record #2, #4 and #6, assuming the first +record is #1. + + root@arch-fb-vm1:~/net-next dd if=/proc/net/ipv6_route bs=128 + 00000000000000000000000000000000 40 00000000000000000000000000000000 00 00000000000000000000000000000000 00000400 00000001 00000000 00000001 eth0 + 00000000000000000000000000000000 00 00000000000000000000000000000000 00 00000000000000000000000000000000 ffffffff 00000001 00000000 00200200 lo + fe800000000000002050e3fffebd3be8 80 00000000000000000000000000000000 00 00000000000000000000000000000000 00000000 00000002 00000000 80200001 eth0 + 00000000000000000000000000000000 00 00000000000000000000000000000000 00 00000000000000000000000000000000 ffffffff 00000001 00000000 00200200 lo +4+1 records in +4+1 records out +600 bytes copied, 0.00127758 s, 470 kB/s + +To fix the problem, create a fake pos pointer so seq_ops->start() +won't actually increase seq_file pos. With this fix, the +above `dd` command with `bs=128` will show correct result. + +Fixes: 4fc427e05158 ("ipv6_route_seq_next should increase position index") +Cc: Alexei Starovoitov +Suggested-by: Vasily Averin +Reviewed-by: Vasily Averin +Signed-off-by: Yonghong Song +Acked-by: Martin KaFai Lau +Acked-by: Andrii Nakryiko +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/ipv6/ip6_fib.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/net/ipv6/ip6_fib.c ++++ b/net/ipv6/ip6_fib.c +@@ -2519,8 +2519,10 @@ static void *ipv6_route_seq_start(struct + iter->skip = *pos; + + if (iter->tbl) { ++ loff_t p = 0; ++ + ipv6_route_seq_setup_walk(iter, net); +- return ipv6_route_seq_next(seq, NULL, pos); ++ return ipv6_route_seq_next(seq, NULL, &p); + } else { + return NULL; + } diff --git a/queue-5.4/net-ipv4-always-honour-route-mtu-during-forwarding.patch b/queue-5.4/net-ipv4-always-honour-route-mtu-during-forwarding.patch new file mode 100644 index 00000000000..61395182c44 --- /dev/null +++ b/queue-5.4/net-ipv4-always-honour-route-mtu-during-forwarding.patch @@ -0,0 +1,80 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: "Maciej Żenczykowski" +Date: Wed, 23 Sep 2020 13:18:15 -0700 +Subject: net/ipv4: always honour route mtu during forwarding + +From: "Maciej Żenczykowski" + +[ Upstream commit 02a1b175b0e92d9e0fa5df3957ade8d733ceb6a0 ] + +Documentation/networking/ip-sysctl.txt:46 says: + ip_forward_use_pmtu - BOOLEAN + By default we don't trust protocol path MTUs while forwarding + because they could be easily forged and can lead to unwanted + fragmentation by the router. + You only need to enable this if you have user-space software + which tries to discover path mtus by itself and depends on the + kernel honoring this information. This is normally not the case. + Default: 0 (disabled) + Possible values: + 0 - disabled + 1 - enabled + +Which makes it pretty clear that setting it to 1 is a potential +security/safety/DoS issue, and yet it is entirely reasonable to want +forwarded traffic to honour explicitly administrator configured +route mtus (instead of defaulting to device mtu). + +Indeed, I can't think of a single reason why you wouldn't want to. +Since you configured a route mtu you probably know better... + +It is pretty common to have a higher device mtu to allow receiving +large (jumbo) frames, while having some routes via that interface +(potentially including the default route to the internet) specify +a lower mtu. + +Note that ipv6 forwarding uses device mtu unless the route is locked +(in which case it will use the route mtu). + +This approach is not usable for IPv4 where an 'mtu lock' on a route +also has the side effect of disabling TCP path mtu discovery via +disabling the IPv4 DF (don't frag) bit on all outgoing frames. + +I'm not aware of a way to lock a route from an IPv6 RA, so that also +potentially seems wrong. + +Signed-off-by: Maciej Żenczykowski +Cc: Eric Dumazet +Cc: Willem de Bruijn +Cc: Lorenzo Colitti +Cc: Sunmeet Gill (Sunny) +Cc: Vinay Paradkar +Cc: Tyler Wear +Cc: David Ahern +Reviewed-by: Eric Dumazet +Signed-off-by: Greg Kroah-Hartman +--- + include/net/ip.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/include/net/ip.h ++++ b/include/net/ip.h +@@ -439,12 +439,18 @@ static inline unsigned int ip_dst_mtu_ma + bool forwarding) + { + struct net *net = dev_net(dst->dev); ++ unsigned int mtu; + + if (net->ipv4.sysctl_ip_fwd_use_pmtu || + ip_mtu_locked(dst) || + !forwarding) + return dst_mtu(dst); + ++ /* 'forwarding = true' case should always honour route mtu */ ++ mtu = dst_metric_raw(dst, RTAX_MTU); ++ if (mtu) ++ return mtu; ++ + return min(READ_ONCE(dst->dev->mtu), IP_MAX_MTU); + } + diff --git a/queue-5.4/net-j1939-j1939_session_fresh_new-fix-missing-initialization-of-skbcnt.patch b/queue-5.4/net-j1939-j1939_session_fresh_new-fix-missing-initialization-of-skbcnt.patch new file mode 100644 index 00000000000..4c16868fafa --- /dev/null +++ b/queue-5.4/net-j1939-j1939_session_fresh_new-fix-missing-initialization-of-skbcnt.patch @@ -0,0 +1,33 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Marc Kleine-Budde +Date: Thu, 8 Oct 2020 23:23:10 +0200 +Subject: net: j1939: j1939_session_fresh_new(): fix missing initialization of skbcnt + +From: Marc Kleine-Budde + +[ Upstream commit 13ba4c434422837d7c8c163f9c8d854e67bf3c99 ] + +This patch add the initialization of skbcnt, similar to: + + e009f95b1543 can: j1935: j1939_tp_tx_dat_new(): fix missing initialization of skbcnt + +Let's play save and initialize this skbcnt as well. + +Suggested-by: Jakub Kicinski +Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") +Signed-off-by: Marc Kleine-Budde +Signed-off-by: Greg Kroah-Hartman +--- + net/can/j1939/transport.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/net/can/j1939/transport.c ++++ b/net/can/j1939/transport.c +@@ -1488,6 +1488,7 @@ j1939_session *j1939_session_fresh_new(s + skb->dev = priv->ndev; + can_skb_reserve(skb); + can_skb_prv(skb)->ifindex = priv->ndev->ifindex; ++ can_skb_prv(skb)->skbcnt = 0; + skcb = j1939_skb_to_cb(skb); + memcpy(skcb, rel_skcb, sizeof(*skcb)); + diff --git a/queue-5.4/net-smc-fix-valid-dmbe-buffer-sizes.patch b/queue-5.4/net-smc-fix-valid-dmbe-buffer-sizes.patch new file mode 100644 index 00000000000..2b3388f1ff1 --- /dev/null +++ b/queue-5.4/net-smc-fix-valid-dmbe-buffer-sizes.patch @@ -0,0 +1,33 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Karsten Graul +Date: Wed, 14 Oct 2020 19:43:28 +0200 +Subject: net/smc: fix valid DMBE buffer sizes + +From: Karsten Graul + +[ Upstream commit ef12ad45880b696eb993d86c481ca891836ab593 ] + +The SMCD_DMBE_SIZES should include all valid DMBE buffer sizes, so the +correct value is 6 which means 1MB. With 7 the registration of an ISM +buffer would always fail because of the invalid size requested. +Fix that and set the value to 6. + +Fixes: c6ba7c9ba43d ("net/smc: add base infrastructure for SMC-D and ISM") +Signed-off-by: Karsten Graul +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/smc/smc_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/smc/smc_core.c ++++ b/net/smc/smc_core.c +@@ -795,7 +795,7 @@ static struct smc_buf_desc *smcr_new_buf + return buf_desc; + } + +-#define SMCD_DMBE_SIZES 7 /* 0 -> 16KB, 1 -> 32KB, .. 6 -> 1MB */ ++#define SMCD_DMBE_SIZES 6 /* 0 -> 16KB, 1 -> 32KB, .. 6 -> 1MB */ + + static struct smc_buf_desc *smcd_new_buf_create(struct smc_link_group *lgr, + bool is_dmb, int bufsize) diff --git a/queue-5.4/net-tls-sendfile-fails-with-ktls-offload.patch b/queue-5.4/net-tls-sendfile-fails-with-ktls-offload.patch new file mode 100644 index 00000000000..ab886e04448 --- /dev/null +++ b/queue-5.4/net-tls-sendfile-fails-with-ktls-offload.patch @@ -0,0 +1,67 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Rohit Maheshwari +Date: Thu, 8 Oct 2020 00:10:21 +0530 +Subject: net/tls: sendfile fails with ktls offload + +From: Rohit Maheshwari + +[ Upstream commit ea1dd3e9d080c961b9a451130b61c72dc9a5397b ] + +At first when sendpage gets called, if there is more data, 'more' in +tls_push_data() gets set which later sets pending_open_record_frags, but +when there is no more data in file left, and last time tls_push_data() +gets called, pending_open_record_frags doesn't get reset. And later when +2 bytes of encrypted alert comes as sendmsg, it first checks for +pending_open_record_frags, and since this is set, it creates a record with +0 data bytes to encrypt, meaning record length is prepend_size + tag_size +only, which causes problem. + We should set/reset pending_open_record_frags based on more bit. + +Fixes: e8f69799810c ("net/tls: Add generic NIC offload infrastructure") +Signed-off-by: Rohit Maheshwari +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/tls/tls_device.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/net/tls/tls_device.c ++++ b/net/tls/tls_device.c +@@ -405,14 +405,14 @@ static int tls_push_data(struct sock *sk + struct tls_context *tls_ctx = tls_get_ctx(sk); + struct tls_prot_info *prot = &tls_ctx->prot_info; + struct tls_offload_context_tx *ctx = tls_offload_ctx_tx(tls_ctx); +- int more = flags & (MSG_SENDPAGE_NOTLAST | MSG_MORE); + struct tls_record_info *record = ctx->open_record; + int tls_push_record_flags; + struct page_frag *pfrag; + size_t orig_size = size; + u32 max_open_record_len; +- int copy, rc = 0; ++ bool more = false; + bool done = false; ++ int copy, rc = 0; + long timeo; + + if (flags & +@@ -480,9 +480,8 @@ handle_error: + if (!size) { + last_record: + tls_push_record_flags = flags; +- if (more) { +- tls_ctx->pending_open_record_frags = +- !!record->num_frags; ++ if (flags & (MSG_SENDPAGE_NOTLAST | MSG_MORE)) { ++ more = true; + break; + } + +@@ -514,6 +513,8 @@ last_record: + } + } while (!done); + ++ tls_ctx->pending_open_record_frags = more; ++ + if (orig_size - size > 0) + rc = orig_size - size; + diff --git a/queue-5.4/net-usb-qmi_wwan-add-cellient-mpl200-card.patch b/queue-5.4/net-usb-qmi_wwan-add-cellient-mpl200-card.patch new file mode 100644 index 00000000000..8a3b9994273 --- /dev/null +++ b/queue-5.4/net-usb-qmi_wwan-add-cellient-mpl200-card.patch @@ -0,0 +1,29 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Wilken Gottwalt +Date: Thu, 8 Oct 2020 09:21:38 +0200 +Subject: net: usb: qmi_wwan: add Cellient MPL200 card + +From: Wilken Gottwalt + +[ Upstream commit 28802e7c0c9954218d1830f7507edc9d49b03a00 ] + +Add usb ids of the Cellient MPL200 card. + +Signed-off-by: Wilken Gottwalt +Acked-by: Bjørn Mork +Signed-off-by: Jakub Kicinski +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 +@@ -1375,6 +1375,7 @@ static const struct usb_device_id produc + {QMI_QUIRK_SET_DTR(0x2cb7, 0x0104, 4)}, /* Fibocom NL678 series */ + {QMI_FIXED_INTF(0x0489, 0xe0b4, 0)}, /* Foxconn T77W968 LTE */ + {QMI_FIXED_INTF(0x0489, 0xe0b5, 0)}, /* Foxconn T77W968 LTE with eSIM support*/ ++ {QMI_FIXED_INTF(0x2692, 0x9025, 4)}, /* Cellient MPL200 (rebranded Qualcomm 05c6:9025) */ + + /* 4. Gobi 1000 devices */ + {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ diff --git a/queue-5.4/net_sched-remove-a-redundant-goto-chain-check.patch b/queue-5.4/net_sched-remove-a-redundant-goto-chain-check.patch new file mode 100644 index 00000000000..1e0b063d845 --- /dev/null +++ b/queue-5.4/net_sched-remove-a-redundant-goto-chain-check.patch @@ -0,0 +1,55 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Cong Wang +Date: Mon, 28 Sep 2020 11:31:03 -0700 +Subject: net_sched: remove a redundant goto chain check + +From: Cong Wang + +[ Upstream commit 1aad8049909a6d3379175ef2824a68ac35c0b564 ] + +All TC actions call tcf_action_check_ctrlact() to validate +goto chain, so this check in tcf_action_init_1() is actually +redundant. Remove it to save troubles of leaking memory. + +Fixes: e49d8c22f126 ("net_sched: defer tcf_idr_insert() in tcf_action_init_1()") +Reported-by: Vlad Buslov +Suggested-by: Davide Caratti +Cc: Jamal Hadi Salim +Cc: Jiri Pirko +Signed-off-by: Cong Wang +Reviewed-by: Davide Caratti +Signed-off-by: Greg Kroah-Hartman +--- + net/sched/act_api.c | 14 -------------- + 1 file changed, 14 deletions(-) + +--- a/net/sched/act_api.c ++++ b/net/sched/act_api.c +@@ -706,13 +706,6 @@ int tcf_action_destroy(struct tc_action + return ret; + } + +-static int tcf_action_destroy_1(struct tc_action *a, int bind) +-{ +- struct tc_action *actions[] = { a, NULL }; +- +- return tcf_action_destroy(actions, bind); +-} +- + static int tcf_action_put(struct tc_action *p) + { + return __tcf_action_put(p, false); +@@ -932,13 +925,6 @@ struct tc_action *tcf_action_init_1(stru + if (err < 0) + goto err_mod; + +- if (TC_ACT_EXT_CMP(a->tcfa_action, TC_ACT_GOTO_CHAIN) && +- !rcu_access_pointer(a->goto_chain)) { +- tcf_action_destroy_1(a, bind); +- NL_SET_ERR_MSG(extack, "can't use goto chain with NULL chain"); +- return ERR_PTR(-EINVAL); +- } +- + if (!name && tb[TCA_ACT_COOKIE]) + tcf_set_action_cookie(&a->act_cookie, cookie); + diff --git a/queue-5.4/r8169-fix-data-corruption-issue-on-rtl8402.patch b/queue-5.4/r8169-fix-data-corruption-issue-on-rtl8402.patch new file mode 100644 index 00000000000..d70f0e41a60 --- /dev/null +++ b/queue-5.4/r8169-fix-data-corruption-issue-on-rtl8402.patch @@ -0,0 +1,36 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Heiner Kallweit +Date: Thu, 1 Oct 2020 09:23:02 +0200 +Subject: r8169: fix data corruption issue on RTL8402 + +From: Heiner Kallweit + +[ Upstream commit ef9da46ddef071e1bbb943afbbe9b38771855554 ] + +Petr reported that after resume from suspend RTL8402 partially +truncates incoming packets, and re-initializing register RxConfig +before the actual chip re-initialization sequence is needed to avoid +the issue. + +Reported-by: Petr Tesarik +Proposed-by: Petr Tesarik +Tested-by: Petr Tesarik +Signed-off-by: Heiner Kallweit +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/realtek/r8169_main.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/ethernet/realtek/r8169_main.c ++++ b/drivers/net/ethernet/realtek/r8169_main.c +@@ -5514,6 +5514,10 @@ static int rtl8169_change_mtu(struct net + dev->mtu = new_mtu; + netdev_update_features(dev); + ++ /* Reportedly at least Asus X453MA truncates packets otherwise */ ++ if (tp->mac_version == RTL_GIGA_MAC_VER_37) ++ rtl_init_rxcfg(tp); ++ + return 0; + } + diff --git a/queue-5.4/series b/queue-5.4/series new file mode 100644 index 00000000000..f74232db672 --- /dev/null +++ b/queue-5.4/series @@ -0,0 +1,19 @@ +ibmveth-switch-order-of-ibmveth_helper-calls.patch +ibmveth-identify-ingress-large-send-packets.patch +ipv4-restore-flowi4_oif-update-before-call-to-xfrm_lookup_route.patch +mlx4-handle-non-napi-callers-to-napi_poll.patch +net-fec-fix-phy_device-lookup-for-phy_reset_after_clk_enable.patch +net-fec-fix-phy-init-after-phy_reset_after_clk_enable.patch +net-fix-pos-incrementment-in-ipv6_route_seq_next.patch +net-smc-fix-valid-dmbe-buffer-sizes.patch +net-tls-sendfile-fails-with-ktls-offload.patch +net-usb-qmi_wwan-add-cellient-mpl200-card.patch +tipc-fix-the-skb_unshare-in-tipc_buf_append.patch +socket-fix-option-so_timestamping_new.patch +can-m_can_platform-don-t-call-m_can_class_suspend-in-runtime-suspend.patch +can-j1935-j1939_tp_tx_dat_new-fix-missing-initialization-of-skbcnt.patch +net-j1939-j1939_session_fresh_new-fix-missing-initialization-of-skbcnt.patch +net-ipv4-always-honour-route-mtu-during-forwarding.patch +net_sched-remove-a-redundant-goto-chain-check.patch +r8169-fix-data-corruption-issue-on-rtl8402.patch +cxgb4-handle-4-tuple-pedit-to-nat-mode-translation.patch diff --git a/queue-5.4/socket-fix-option-so_timestamping_new.patch b/queue-5.4/socket-fix-option-so_timestamping_new.patch new file mode 100644 index 00000000000..d991992c971 --- /dev/null +++ b/queue-5.4/socket-fix-option-so_timestamping_new.patch @@ -0,0 +1,63 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Christian Eggers +Date: Mon, 12 Oct 2020 11:35:41 +0200 +Subject: socket: fix option SO_TIMESTAMPING_NEW + +From: Christian Eggers + +[ Upstream commit 59e611a566e7cd48cf54b6777a11fe3f9c2f9db5 ] + +The comparison of optname with SO_TIMESTAMPING_NEW is wrong way around, +so SOCK_TSTAMP_NEW will first be set and than reset again. Additionally +move it out of the test for SOF_TIMESTAMPING_RX_SOFTWARE as this seems +unrelated. + +This problem happens on 32 bit platforms were the libc has already +switched to struct timespec64 (from SO_TIMExxx_OLD to SO_TIMExxx_NEW +socket options). ptp4l complains with "missing timestamp on transmitted +peer delay request" because the wrong format is received (and +discarded). + +Fixes: 9718475e6908 ("socket: Add SO_TIMESTAMPING_NEW") +Signed-off-by: Christian Eggers +Reviewed-by: Willem de Bruijn +Reviewed-by: Deepa Dinamani +Acked-by: Willem de Bruijn +Acked-by: Deepa Dinamani +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/core/sock.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +--- a/net/core/sock.c ++++ b/net/core/sock.c +@@ -928,8 +928,6 @@ set_rcvbuf: + break; + + case SO_TIMESTAMPING_NEW: +- sock_set_flag(sk, SOCK_TSTAMP_NEW); +- /* fall through */ + case SO_TIMESTAMPING_OLD: + if (val & ~SOF_TIMESTAMPING_MASK) { + ret = -EINVAL; +@@ -958,16 +956,14 @@ set_rcvbuf: + } + + sk->sk_tsflags = val; ++ sock_valbool_flag(sk, SOCK_TSTAMP_NEW, optname == SO_TIMESTAMPING_NEW); ++ + if (val & SOF_TIMESTAMPING_RX_SOFTWARE) + sock_enable_timestamp(sk, + SOCK_TIMESTAMPING_RX_SOFTWARE); +- else { +- if (optname == SO_TIMESTAMPING_NEW) +- sock_reset_flag(sk, SOCK_TSTAMP_NEW); +- ++ else + sock_disable_timestamp(sk, + (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)); +- } + break; + + case SO_RCVLOWAT: diff --git a/queue-5.4/tipc-fix-the-skb_unshare-in-tipc_buf_append.patch b/queue-5.4/tipc-fix-the-skb_unshare-in-tipc_buf_append.patch new file mode 100644 index 00000000000..f08b21314d4 --- /dev/null +++ b/queue-5.4/tipc-fix-the-skb_unshare-in-tipc_buf_append.patch @@ -0,0 +1,41 @@ +From foo@baz Sat Oct 17 11:01:11 AM CEST 2020 +From: Cong Wang +Date: Wed, 7 Oct 2020 21:12:50 -0700 +Subject: tipc: fix the skb_unshare() in tipc_buf_append() + +From: Cong Wang + +[ Upstream commit ed42989eab57d619667d7e87dfbd8fe207db54fe ] + +skb_unshare() drops a reference count on the old skb unconditionally, +so in the failure case, we end up freeing the skb twice here. +And because the skb is allocated in fclone and cloned by caller +tipc_msg_reassemble(), the consequence is actually freeing the +original skb too, thus triggered the UAF by syzbot. + +Fix this by replacing this skb_unshare() with skb_cloned()+skb_copy(). + +Fixes: ff48b6222e65 ("tipc: use skb_unshare() instead in tipc_buf_append()") +Reported-and-tested-by: syzbot+e96a7ba46281824cc46a@syzkaller.appspotmail.com +Cc: Jon Maloy +Cc: Ying Xue +Signed-off-by: Cong Wang +Reviewed-by: Xin Long +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + net/tipc/msg.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/tipc/msg.c ++++ b/net/tipc/msg.c +@@ -140,7 +140,8 @@ int tipc_buf_append(struct sk_buff **hea + if (fragid == FIRST_FRAGMENT) { + if (unlikely(head)) + goto err; +- frag = skb_unshare(frag, GFP_ATOMIC); ++ if (skb_cloned(frag)) ++ frag = skb_copy(frag, GFP_ATOMIC); + if (unlikely(!frag)) + goto err; + head = *headbuf = frag;