From: Greg Kroah-Hartman Date: Sat, 28 Oct 2023 07:34:02 +0000 (+0200) Subject: 4.19-stable patches X-Git-Tag: v6.1.61~61 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8865871b9f8bf5b411a410b92fc691c3fee612c0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: gtp-fix-fragmentation-needed-check-with-gso.patch i40e-fix-wrong-check-for-i40e_txr_flags_wb_on_itr.patch --- diff --git a/queue-4.19/gtp-fix-fragmentation-needed-check-with-gso.patch b/queue-4.19/gtp-fix-fragmentation-needed-check-with-gso.patch new file mode 100644 index 00000000000..0f1eb3ae5cc --- /dev/null +++ b/queue-4.19/gtp-fix-fragmentation-needed-check-with-gso.patch @@ -0,0 +1,33 @@ +From 4530e5b8e2dad63dcad2206232dd86e4b1489b6c Mon Sep 17 00:00:00 2001 +From: Pablo Neira Ayuso +Date: Sun, 22 Oct 2023 22:25:18 +0200 +Subject: gtp: fix fragmentation needed check with gso + +From: Pablo Neira Ayuso + +commit 4530e5b8e2dad63dcad2206232dd86e4b1489b6c upstream. + +Call skb_gso_validate_network_len() to check if packet is over PMTU. + +Fixes: 459aa660eb1d ("gtp: add initial driver for datapath of GPRS Tunneling Protocol (GTP-U)") +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/gtp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/net/gtp.c ++++ b/drivers/net/gtp.c +@@ -548,8 +548,9 @@ static int gtp_build_skb_ip4(struct sk_b + + rt->dst.ops->update_pmtu(&rt->dst, NULL, skb, mtu, false); + +- if (!skb_is_gso(skb) && (iph->frag_off & htons(IP_DF)) && +- mtu < ntohs(iph->tot_len)) { ++ if (iph->frag_off & htons(IP_DF) && ++ ((!skb_is_gso(skb) && skb->len > mtu) || ++ (skb_is_gso(skb) && !skb_gso_validate_network_len(skb, mtu)))) { + netdev_dbg(dev, "packet too big, fragmentation needed\n"); + icmp_ndo_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, + htonl(mtu)); diff --git a/queue-4.19/i40e-fix-wrong-check-for-i40e_txr_flags_wb_on_itr.patch b/queue-4.19/i40e-fix-wrong-check-for-i40e_txr_flags_wb_on_itr.patch new file mode 100644 index 00000000000..43771b2247f --- /dev/null +++ b/queue-4.19/i40e-fix-wrong-check-for-i40e_txr_flags_wb_on_itr.patch @@ -0,0 +1,33 @@ +From 77a8c982ff0d4c3a14022c6fe9e3dbfb327552ec Mon Sep 17 00:00:00 2001 +From: Ivan Vecera +Date: Mon, 23 Oct 2023 14:27:14 -0700 +Subject: i40e: Fix wrong check for I40E_TXR_FLAGS_WB_ON_ITR + +From: Ivan Vecera + +commit 77a8c982ff0d4c3a14022c6fe9e3dbfb327552ec upstream. + +The I40E_TXR_FLAGS_WB_ON_ITR is i40e_ring flag and not i40e_pf one. + +Fixes: 8e0764b4d6be42 ("i40e/i40evf: Add support for writeback on ITR feature for X722") +Signed-off-by: Ivan Vecera +Tested-by: Pucha Himasekhar Reddy (A Contingent worker at Intel) +Signed-off-by: Jacob Keller +Link: https://lore.kernel.org/r/20231023212714.178032-1-jacob.e.keller@intel.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c ++++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c +@@ -2642,7 +2642,7 @@ tx_only: + return budget; + } + +- if (vsi->back->flags & I40E_TXR_FLAGS_WB_ON_ITR) ++ if (q_vector->tx.ring[0].flags & I40E_TXR_FLAGS_WB_ON_ITR) + q_vector->arm_wb_state = false; + + /* Work is done so exit the polling mode and re-enable the interrupt */ diff --git a/queue-4.19/series b/queue-4.19/series index 37b035998ff..9b5c5b1b538 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -10,3 +10,5 @@ r8169-fix-the-kcsan-reported-data-race-in-rtl_tx-whi.patch r8169-fix-the-kcsan-reported-data-race-in-rtl_rx-whi.patch treewide-spelling-fix-in-comment.patch igb-fix-potential-memory-leak-in-igb_add_ethtool_nfc.patch +gtp-fix-fragmentation-needed-check-with-gso.patch +i40e-fix-wrong-check-for-i40e_txr_flags_wb_on_itr.patch