From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 07:46:54 +0000 (+0200) Subject: drop a bunch of patches for kcfi X-Git-Tag: v6.0.3~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11c8f99c7a472b28ca8dc39b15895a176b8ecae5;p=thirdparty%2Fkernel%2Fstable-queue.git drop a bunch of patches for kcfi --- diff --git a/queue-4.14/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-4.14/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index 318a443d7af..00000000000 --- a/queue-4.14/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 88c6582c7c3a9c19958da779468d0e9bdc14ceb8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index 8b07890b0b23..833e27ce4a57 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1025,7 +1025,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-4.14/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-4.14/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index 4c5314649bb..00000000000 --- a/queue-4.14/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3b134a8ac54c2bfacd7eb15dd1194b62366ea4ef Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index da536385075a..f226e8f84835 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -955,7 +955,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-4.14/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-4.14/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index dc06647ee3b..00000000000 --- a/queue-4.14/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e542e8b4fb5a412779b47334320a689f2879176d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index ec1c14e3eace..09e3e516ded3 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -193,7 +193,8 @@ static void korina_chain_rx(struct korina_private *lp, - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - unsigned long flags; --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 37bd7a6880e..6d87614425c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -178,9 +178,6 @@ net-lantiq_etop-fix-return-type-for-implementation-o.patch net-ftmac100-fix-endianness-related-issues-from-spar.patch wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-korina-fix-return-type-of-korina_send_packet.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch wifi-rt2x00-don-t-run-rt5592-iq-calibration-on-mt762.patch diff --git a/queue-4.19/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-4.19/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index 99253a6e8bf..00000000000 --- a/queue-4.19/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 48b355d7bf814f5ba415e32a28cc9d6cde1f7afc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index 8b07890b0b23..833e27ce4a57 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1025,7 +1025,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-4.19/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-4.19/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index a3b95267a23..00000000000 --- a/queue-4.19/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0d4bcf29e168596a3d1da2c63bb2646589dc4cef Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index 566da1e3cfbc..337e38b98d69 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -955,7 +955,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-4.19/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-4.19/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index 2e0ae063dbc..00000000000 --- a/queue-4.19/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e3eb1efdc92b5ff239d78ba9bbc06ea0075efb33 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index 9f804e2aba35..d1bd56f6eecb 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -196,7 +196,8 @@ static void korina_chain_rx(struct korina_private *lp, - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - unsigned long flags; --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 9947f1e3595..3abae8410c8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -191,9 +191,6 @@ net-lantiq_etop-fix-return-type-for-implementation-o.patch net-ftmac100-fix-endianness-related-issues-from-spar.patch wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-korina-fix-return-type-of-korina_send_packet.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch diff --git a/queue-4.9/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-4.9/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index 42e4883c7c7..00000000000 --- a/queue-4.9/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 45f754f7dd409c836b002bbd00a492af83419027 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index 0fe4d8999823..59e09f7174c1 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1023,7 +1023,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-4.9/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-4.9/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index 7d7bc79e2a0..00000000000 --- a/queue-4.9/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5c2820e58b4e279579bc4b599b4c6cea0fe0016f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index 37162492e263..ebf22429c349 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -955,7 +955,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-4.9/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-4.9/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index 98e86f3222f..00000000000 --- a/queue-4.9/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d5d3fd87ed3a9ac722cc78c56d6fb2f2a61899a5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index 4cf1fc89df3c..b9c02cd3a78e 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -193,7 +193,8 @@ static void korina_chain_rx(struct korina_private *lp, - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - unsigned long flags; --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index b3de0504a8f..a17582c6f30 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -134,9 +134,6 @@ net-xscale-fix-return-type-for-implementation-of-ndo.patch net-lantiq_etop-fix-return-type-for-implementation-o.patch net-ftmac100-fix-endianness-related-issues-from-spar.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-korina-fix-return-type-of-korina_send_packet.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch wifi-rt2x00-don-t-run-rt5592-iq-calibration-on-mt762.patch diff --git a/queue-5.10/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-5.10/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index 18f7349727d..00000000000 --- a/queue-5.10/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0ce129fff05513ef0e2cf594131b5110a5de59c3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index afc4a103c508..c9ee5185e73e 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1015,7 +1015,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-5.10/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-5.10/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index 242a96057e8..00000000000 --- a/queue-5.10/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a2a2442084cb620dc363e83410ee3fbdfecc6afe Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index ad5293571af4..1dbba3e8ce50 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -942,7 +942,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-5.10/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-5.10/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index ab978c924f1..00000000000 --- a/queue-5.10/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 38f4e2fc311463efb20aacbd18ec31bee4abb49a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index 925161959b9b..7d74bb932ee1 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -196,7 +196,8 @@ static void korina_chain_rx(struct korina_private *lp, - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - unsigned long flags; --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 59f4c3c6b3c..25778ebfdda 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -367,9 +367,6 @@ net-ftmac100-fix-endianness-related-issues-from-spar.patch wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch regulator-core-prevent-integer-underflow.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-korina-fix-return-type-of-korina_send_packet.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch diff --git a/queue-5.15/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-5.15/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index b516145abec..00000000000 --- a/queue-5.15/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8646cc3e481d3524314bcfd1b34802962a1eb291 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index e842de6f6635..a2ce9d7ad750 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1012,7 +1012,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-5.15/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch b/queue-5.15/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch deleted file mode 100644 index 6e86cb2e41e..00000000000 --- a/queue-5.15/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f5596fa312d27f162dce2b342be8ce02474f24bb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:53:07 -0700 -Subject: net: ethernet: litex: Fix return type of liteeth_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 40662333dd7c64664247a6138bc33f3974e3a331 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of liteeth_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Acked-by: Gabriel Somlo -Link: https://lore.kernel.org/r/20220912195307.812229-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/litex/litex_liteeth.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c -index 5bb1cc8a2ce1..0aa855f838f2 100644 ---- a/drivers/net/ethernet/litex/litex_liteeth.c -+++ b/drivers/net/ethernet/litex/litex_liteeth.c -@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev) - return 0; - } - --static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev) -+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb, -+ struct net_device *netdev) - { - struct liteeth *priv = netdev_priv(netdev); - void __iomem *txbuffer; --- -2.35.1 - diff --git a/queue-5.15/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-5.15/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index addc4a85be6..00000000000 --- a/queue-5.15/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3b7056aae5d8efcd31e6feee0d668591ce6eaa53 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index d243ca5dfde0..4d3bd6e1db55 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -950,7 +950,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-5.15/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-5.15/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index 643d5bc3b9c..00000000000 --- a/queue-5.15/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c9acc00e94eae1dbd33df4fe43429b96580bb0f5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index 3e9f324f1061..2e6f51a0eab0 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev) - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - u32 chain_prev, chain_next; --- -2.35.1 - diff --git a/queue-5.15/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch b/queue-5.15/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch deleted file mode 100644 index d3aea42a3a5..00000000000 --- a/queue-5.15/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 265d5178efc85ea9d1fe947ed6bb2cba01cf5052 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:44:55 -0700 -Subject: net: wwan: iosm: Fix return type of ipc_wwan_link_transmit - -From: Nathan Huckleberry - -[ Upstream commit 0c9441c430104dcf2cd066aae74dbeefb9f9e1bf ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of ipc_wwan_link_transmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Sergey Ryazanov -Link: https://lore.kernel.org/r/20220912214455.929028-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/wwan/iosm/iosm_ipc_wwan.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wwan/iosm/iosm_ipc_wwan.c b/drivers/net/wwan/iosm/iosm_ipc_wwan.c -index 92f064a8f837..bd509a9fa709 100644 ---- a/drivers/net/wwan/iosm/iosm_ipc_wwan.c -+++ b/drivers/net/wwan/iosm/iosm_ipc_wwan.c -@@ -102,8 +102,8 @@ static int ipc_wwan_link_stop(struct net_device *netdev) - } - - /* Transmit a packet */ --static int ipc_wwan_link_transmit(struct sk_buff *skb, -- struct net_device *netdev) -+static netdev_tx_t ipc_wwan_link_transmit(struct sk_buff *skb, -+ struct net_device *netdev) - { - struct iosm_netdev_priv *priv = wwan_netdev_drvpriv(netdev); - struct iosm_wwan *ipc_wwan = priv->ipc_wwan; --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index ed83af87686..99c993f254c 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -501,11 +501,6 @@ bluetooth-btintel-mark-intel-controller-to-support-l.patch regulator-core-prevent-integer-underflow.patch wifi-mt76-mt7921-reset-msta-airtime_ac-while-clearin.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-ethernet-litex-fix-return-type-of-liteeth_start_.patch -net-korina-fix-return-type-of-korina_send_packet.patch -net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch diff --git a/queue-5.19/net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch b/queue-5.19/net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch deleted file mode 100644 index 6f013952b03..00000000000 --- a/queue-5.19/net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cac43e35ff792fad716456df12c9177bd257f388 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:40:30 -0700 -Subject: net: ax88796c: Fix return type of ax88796c_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit fcb7c210a24209ea8f6f32593580b57f52382ec2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of ax88796c_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Lukasz Stelmach -Link: https://lore.kernel.org/r/20220912194031.808425-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/asix/ax88796c_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c -index 6ba5b024a7be..f1d610efd69e 100644 ---- a/drivers/net/ethernet/asix/ax88796c_main.c -+++ b/drivers/net/ethernet/asix/ax88796c_main.c -@@ -381,7 +381,7 @@ static int ax88796c_hard_xmit(struct ax88796c_device *ax_local) - return 1; - } - --static int -+static netdev_tx_t - ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct ax88796c_device *ax_local = to_ax88796c_device(ndev); --- -2.35.1 - diff --git a/queue-5.19/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-5.19/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index 3328e6dc949..00000000000 --- a/queue-5.19/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8064409f20f54def0b2345f3c8f4ac5857afe4a9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index 0985ab216566..186a5e0a7862 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1012,7 +1012,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-5.19/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch b/queue-5.19/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch deleted file mode 100644 index 3f2195c6e2b..00000000000 --- a/queue-5.19/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 44ff5a66271ba06f2e8d5988d285fa592f6a5c2d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:53:07 -0700 -Subject: net: ethernet: litex: Fix return type of liteeth_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 40662333dd7c64664247a6138bc33f3974e3a331 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of liteeth_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Acked-by: Gabriel Somlo -Link: https://lore.kernel.org/r/20220912195307.812229-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/litex/litex_liteeth.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c -index fdd99f0de424..35f24e0f0934 100644 ---- a/drivers/net/ethernet/litex/litex_liteeth.c -+++ b/drivers/net/ethernet/litex/litex_liteeth.c -@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev) - return 0; - } - --static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev) -+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb, -+ struct net_device *netdev) - { - struct liteeth *priv = netdev_priv(netdev); - void __iomem *txbuffer; --- -2.35.1 - diff --git a/queue-5.19/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-5.19/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index 2cd8286deb1..00000000000 --- a/queue-5.19/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 65258e4595585c7e38690b0c4366bec8f5a0d447 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index 2a3e4e842fa5..e203a5984f03 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -949,7 +949,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-5.19/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-5.19/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index f94a9190f97..00000000000 --- a/queue-5.19/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2f39d2299a1e11c7766ac6f8519cf10e6e502236 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index df9a8eefa007..eec6a9ec528b 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev) - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - u32 chain_prev, chain_next; --- -2.35.1 - diff --git a/queue-5.19/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch b/queue-5.19/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch deleted file mode 100644 index 8ccbb7d4287..00000000000 --- a/queue-5.19/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0b5505f5d6537071494291ede2c9fffc2d80392f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Sep 2022 11:27:03 -0700 -Subject: net: lan966x: Fix return type of lan966x_port_xmit - -From: Nathan Huckleberry - -[ Upstream commit 450a580fc4b5e7f7fb8d9b1a0208bf0d1efc53a8 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of lan966x_port_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220929182704.64438-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c -index d928b75f3780..be40c6d3ec68 100644 ---- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c -+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c -@@ -344,7 +344,8 @@ static void lan966x_ifh_set_timestamp(void *ifh, u64 timestamp) - IFH_POS_TIMESTAMP, IFH_LEN * 4, PACK, 0); - } - --static int lan966x_port_xmit(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t lan966x_port_xmit(struct sk_buff *skb, -+ struct net_device *dev) - { - struct lan966x_port *port = netdev_priv(dev); - struct lan966x *lan966x = port->lan966x; --- -2.35.1 - diff --git a/queue-5.19/net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch b/queue-5.19/net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch deleted file mode 100644 index 27083703459..00000000000 --- a/queue-5.19/net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 646ee410cdea4c6b41795ddefd254ac98498b0d7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Sep 2022 11:19:47 -0700 -Subject: net: sparx5: Fix return type of sparx5_port_xmit_impl - -From: Nathan Huckleberry - -[ Upstream commit 73ea735073599430818e89b8901452287a15a718 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of sparx5_port_xmit_impl should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/microchip/sparx5/sparx5_main.h | 2 +- - drivers/net/ethernet/microchip/sparx5/sparx5_packet.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h -index d071ac3b7106..705d8852078f 100644 ---- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h -+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h -@@ -291,7 +291,7 @@ struct frame_info { - void sparx5_xtr_flush(struct sparx5 *sparx5, u8 grp); - void sparx5_ifh_parse(u32 *ifh, struct frame_info *info); - irqreturn_t sparx5_xtr_handler(int irq, void *_priv); --int sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev); -+netdev_tx_t sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev); - int sparx5_manual_injection_mode(struct sparx5 *sparx5); - void sparx5_port_inj_timer_setup(struct sparx5_port *port); - -diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c -index 21844beba72d..83c16ca5b30f 100644 ---- a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c -+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c -@@ -222,13 +222,13 @@ static int sparx5_inject(struct sparx5 *sparx5, - return NETDEV_TX_OK; - } - --int sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev) -+netdev_tx_t sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev) - { - struct net_device_stats *stats = &dev->stats; - struct sparx5_port *port = netdev_priv(dev); - struct sparx5 *sparx5 = port->sparx5; - u32 ifh[IFH_LEN]; -- int ret; -+ netdev_tx_t ret; - - memset(ifh, 0, IFH_LEN * 4); - sparx5_set_port_ifh(ifh, port->portno); --- -2.35.1 - diff --git a/queue-5.19/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch b/queue-5.19/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch deleted file mode 100644 index 82ca9544350..00000000000 --- a/queue-5.19/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e0c008bacabdd4c43c297459e3022fdfcc6b4880 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:44:55 -0700 -Subject: net: wwan: iosm: Fix return type of ipc_wwan_link_transmit - -From: Nathan Huckleberry - -[ Upstream commit 0c9441c430104dcf2cd066aae74dbeefb9f9e1bf ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of ipc_wwan_link_transmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Sergey Ryazanov -Link: https://lore.kernel.org/r/20220912214455.929028-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/wwan/iosm/iosm_ipc_wwan.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wwan/iosm/iosm_ipc_wwan.c b/drivers/net/wwan/iosm/iosm_ipc_wwan.c -index 4712f01a7e33..2f1f8b5d5b59 100644 ---- a/drivers/net/wwan/iosm/iosm_ipc_wwan.c -+++ b/drivers/net/wwan/iosm/iosm_ipc_wwan.c -@@ -103,8 +103,8 @@ static int ipc_wwan_link_stop(struct net_device *netdev) - } - - /* Transmit a packet */ --static int ipc_wwan_link_transmit(struct sk_buff *skb, -- struct net_device *netdev) -+static netdev_tx_t ipc_wwan_link_transmit(struct sk_buff *skb, -+ struct net_device *netdev) - { - struct iosm_netdev_priv *priv = wwan_netdev_drvpriv(netdev); - struct iosm_wwan *ipc_wwan = priv->ipc_wwan; --- -2.35.1 - diff --git a/queue-5.19/net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch b/queue-5.19/net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch deleted file mode 100644 index a37303c35c8..00000000000 --- a/queue-5.19/net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1a3272862d28ab330ed7b2eec84fa560776bf955 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:45:10 -0700 -Subject: net: wwan: t7xx: Fix return type of t7xx_ccmni_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 73c99e26036529e633a0f2d628ad7ddff6594668 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of t7xx_ccmni_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Sergey Ryazanov -Link: https://lore.kernel.org/r/20220912214510.929070-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/wwan/t7xx/t7xx_netdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wwan/t7xx/t7xx_netdev.c b/drivers/net/wwan/t7xx/t7xx_netdev.c -index c6b6547f2c6f..f71d3bc3b237 100644 ---- a/drivers/net/wwan/t7xx/t7xx_netdev.c -+++ b/drivers/net/wwan/t7xx/t7xx_netdev.c -@@ -74,7 +74,7 @@ static int t7xx_ccmni_send_packet(struct t7xx_ccmni *ccmni, struct sk_buff *skb, - return 0; - } - --static int t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct t7xx_ccmni *ccmni = wwan_netdev_drvpriv(dev); - int skb_len = skb->len; --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index d61ce997f89..fc3ed63a6de 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -675,13 +675,6 @@ wifi-mt76-mt7921-reset-msta-airtime_ac-while-clearin.patch wifi-rtw89-free-unused-skb-to-prevent-memory-leak.patch wifi-rtw89-fix-rx-filter-after-scan.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-ethernet-litex-fix-return-type-of-liteeth_start_.patch -net-korina-fix-return-type-of-korina_send_packet.patch -net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch -net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch bnxt_en-replace-reset-with-config-timestamps.patch @@ -700,8 +693,6 @@ bluetooth-l2cap-fix-user-after-free.patch net-sched-cls_u32-avoid-memcpy-false-positive-warnin.patch libbpf-fix-overrun-in-netlink-attribute-iteration.patch i2c-designware-pci-group-amd-navi-quirk-parts-togeth.patch -net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch -net-lan966x-fix-return-type-of-lan966x_port_xmit.patch r8152-rate-limit-overflow-messages.patch drm-nouveau-nouveau_bo-fix-potential-memory-leak-in-.patch drm-use-size_t-type-for-len-variable-in-drm_copy_fie.patch diff --git a/queue-5.4/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-5.4/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index db242b63d3d..00000000000 --- a/queue-5.4/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 34a59242ea2b78adf1519c2b4b23435ba907ba91 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index 1d5d8984b49a..2dcf85ae5eb3 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1017,7 +1017,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-5.4/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-5.4/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index 2f17067eeae..00000000000 --- a/queue-5.4/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6f2d47ef70edcfac829a10f666669edc02dc6821 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index fac59032bf83..47a7c40f576e 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -941,7 +941,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-5.4/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-5.4/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index 05f9c482d7f..00000000000 --- a/queue-5.4/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 563722f87daaa993bec92ded6021f05b50690190 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index 9f804e2aba35..d1bd56f6eecb 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -196,7 +196,8 @@ static void korina_chain_rx(struct korina_private *lp, - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - unsigned long flags; --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index d6f5616106a..555890a019c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -207,9 +207,6 @@ net-lantiq_etop-fix-return-type-for-implementation-o.patch net-ftmac100-fix-endianness-related-issues-from-spar.patch wifi-brcmfmac-fix-use-after-free-bug-in-brcmf_netdev.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-korina-fix-return-type-of-korina_send_packet.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch can-bcm-check-the-result-of-can_send-in-bcm_can_tx.patch diff --git a/queue-6.0/net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch b/queue-6.0/net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch deleted file mode 100644 index dbe37f177fc..00000000000 --- a/queue-6.0/net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d56419e8549fe1ebe417cc28351ded4793000569 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:40:30 -0700 -Subject: net: ax88796c: Fix return type of ax88796c_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit fcb7c210a24209ea8f6f32593580b57f52382ec2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of ax88796c_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Lukasz Stelmach -Link: https://lore.kernel.org/r/20220912194031.808425-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/asix/ax88796c_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c -index 6ba5b024a7be..f1d610efd69e 100644 ---- a/drivers/net/ethernet/asix/ax88796c_main.c -+++ b/drivers/net/ethernet/asix/ax88796c_main.c -@@ -381,7 +381,7 @@ static int ax88796c_hard_xmit(struct ax88796c_device *ax_local) - return 1; - } - --static int -+static netdev_tx_t - ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct ax88796c_device *ax_local = to_ax88796c_device(ndev); --- -2.35.1 - diff --git a/queue-6.0/net-davicom-fix-return-type-of-dm9000_start_xmit.patch b/queue-6.0/net-davicom-fix-return-type-of-dm9000_start_xmit.patch deleted file mode 100644 index 6197f4b5df5..00000000000 --- a/queue-6.0/net-davicom-fix-return-type-of-dm9000_start_xmit.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 527b15e38c9887ae3ebbe0bdc0713478bfe98631 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:47:19 -0700 -Subject: net: davicom: Fix return type of dm9000_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of dm9000_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/davicom/dm9000.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c -index 0985ab216566..186a5e0a7862 100644 ---- a/drivers/net/ethernet/davicom/dm9000.c -+++ b/drivers/net/ethernet/davicom/dm9000.c -@@ -1012,7 +1012,7 @@ static void dm9000_send_packet(struct net_device *dev, - * Hardware start transmission. - * Send a packet to media from the upper layer. - */ --static int -+static netdev_tx_t - dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - unsigned long flags; --- -2.35.1 - diff --git a/queue-6.0/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch b/queue-6.0/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch deleted file mode 100644 index a939808c6e5..00000000000 --- a/queue-6.0/net-ethernet-litex-fix-return-type-of-liteeth_start_.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e8cc5416570c9a10d8011c96bb8ffa157ddf585b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:53:07 -0700 -Subject: net: ethernet: litex: Fix return type of liteeth_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 40662333dd7c64664247a6138bc33f3974e3a331 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of liteeth_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Acked-by: Gabriel Somlo -Link: https://lore.kernel.org/r/20220912195307.812229-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/litex/litex_liteeth.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c -index fdd99f0de424..35f24e0f0934 100644 ---- a/drivers/net/ethernet/litex/litex_liteeth.c -+++ b/drivers/net/ethernet/litex/litex_liteeth.c -@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev) - return 0; - } - --static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev) -+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb, -+ struct net_device *netdev) - { - struct liteeth *priv = netdev_priv(netdev); - void __iomem *txbuffer; --- -2.35.1 - diff --git a/queue-6.0/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch b/queue-6.0/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch deleted file mode 100644 index 97e6b7184a6..00000000000 --- a/queue-6.0/net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 37936c71fe02e0748b89444dedda1c3cdbe3afd5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 12:50:19 -0700 -Subject: net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit - -From: Nathan Huckleberry - -[ Upstream commit 5972ca946098487c5155fe13654743f9010f5ed5 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of emac_dev_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912195023.810319-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/ti/davinci_emac.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c -index 2a3e4e842fa5..e203a5984f03 100644 ---- a/drivers/net/ethernet/ti/davinci_emac.c -+++ b/drivers/net/ethernet/ti/davinci_emac.c -@@ -949,7 +949,7 @@ static void emac_tx_handler(void *token, int len, int status) - * - * Returns success(NETDEV_TX_OK) or error code (typically out of desc's) - */ --static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) -+static netdev_tx_t emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) - { - struct device *emac_dev = &ndev->dev; - int ret_code; --- -2.35.1 - diff --git a/queue-6.0/net-korina-fix-return-type-of-korina_send_packet.patch b/queue-6.0/net-korina-fix-return-type-of-korina_send_packet.patch deleted file mode 100644 index 7d188700108..00000000000 --- a/queue-6.0/net-korina-fix-return-type-of-korina_send_packet.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a35eddc489c3abc2963121c4ef39508741336869 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:43:40 -0700 -Subject: net: korina: Fix return type of korina_send_packet - -From: Nathan Huckleberry - -[ Upstream commit 106c67ce46f3c82dd276e983668a91d6ed631173 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of korina_send_packet should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220912214344.928925-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/korina.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c -index df9a8eefa007..eec6a9ec528b 100644 ---- a/drivers/net/ethernet/korina.c -+++ b/drivers/net/ethernet/korina.c -@@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev) - } - - /* transmit packet */ --static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t korina_send_packet(struct sk_buff *skb, -+ struct net_device *dev) - { - struct korina_private *lp = netdev_priv(dev); - u32 chain_prev, chain_next; --- -2.35.1 - diff --git a/queue-6.0/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch b/queue-6.0/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch deleted file mode 100644 index e68832916b6..00000000000 --- a/queue-6.0/net-lan966x-fix-return-type-of-lan966x_port_xmit.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5a04b7109cf96397e17cb0f5ea7f50752ff95408 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Sep 2022 11:27:03 -0700 -Subject: net: lan966x: Fix return type of lan966x_port_xmit - -From: Nathan Huckleberry - -[ Upstream commit 450a580fc4b5e7f7fb8d9b1a0208bf0d1efc53a8 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of lan966x_port_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Reviewed-by: Nathan Chancellor -Link: https://lore.kernel.org/r/20220929182704.64438-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c -index d928b75f3780..be40c6d3ec68 100644 ---- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c -+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c -@@ -344,7 +344,8 @@ static void lan966x_ifh_set_timestamp(void *ifh, u64 timestamp) - IFH_POS_TIMESTAMP, IFH_LEN * 4, PACK, 0); - } - --static int lan966x_port_xmit(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t lan966x_port_xmit(struct sk_buff *skb, -+ struct net_device *dev) - { - struct lan966x_port *port = netdev_priv(dev); - struct lan966x *lan966x = port->lan966x; --- -2.35.1 - diff --git a/queue-6.0/net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch b/queue-6.0/net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch deleted file mode 100644 index 725462ccee4..00000000000 --- a/queue-6.0/net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 70f967af58b8c3ff7ab499f30b55dc504c10afae Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 29 Sep 2022 11:19:47 -0700 -Subject: net: sparx5: Fix return type of sparx5_port_xmit_impl - -From: Nathan Huckleberry - -[ Upstream commit 73ea735073599430818e89b8901452287a15a718 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of sparx5_port_xmit_impl should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/microchip/sparx5/sparx5_main.h | 2 +- - drivers/net/ethernet/microchip/sparx5/sparx5_packet.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h -index d071ac3b7106..705d8852078f 100644 ---- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.h -+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.h -@@ -291,7 +291,7 @@ struct frame_info { - void sparx5_xtr_flush(struct sparx5 *sparx5, u8 grp); - void sparx5_ifh_parse(u32 *ifh, struct frame_info *info); - irqreturn_t sparx5_xtr_handler(int irq, void *_priv); --int sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev); -+netdev_tx_t sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev); - int sparx5_manual_injection_mode(struct sparx5 *sparx5); - void sparx5_port_inj_timer_setup(struct sparx5_port *port); - -diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c -index 21844beba72d..83c16ca5b30f 100644 ---- a/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c -+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_packet.c -@@ -222,13 +222,13 @@ static int sparx5_inject(struct sparx5 *sparx5, - return NETDEV_TX_OK; - } - --int sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev) -+netdev_tx_t sparx5_port_xmit_impl(struct sk_buff *skb, struct net_device *dev) - { - struct net_device_stats *stats = &dev->stats; - struct sparx5_port *port = netdev_priv(dev); - struct sparx5 *sparx5 = port->sparx5; - u32 ifh[IFH_LEN]; -- int ret; -+ netdev_tx_t ret; - - memset(ifh, 0, IFH_LEN * 4); - sparx5_set_port_ifh(ifh, port->portno); --- -2.35.1 - diff --git a/queue-6.0/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch b/queue-6.0/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch deleted file mode 100644 index 0bf95677d5d..00000000000 --- a/queue-6.0/net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2a230c1f35ea04d2ec7798c191a98e758cfa695a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:44:55 -0700 -Subject: net: wwan: iosm: Fix return type of ipc_wwan_link_transmit - -From: Nathan Huckleberry - -[ Upstream commit 0c9441c430104dcf2cd066aae74dbeefb9f9e1bf ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of ipc_wwan_link_transmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Sergey Ryazanov -Link: https://lore.kernel.org/r/20220912214455.929028-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/wwan/iosm/iosm_ipc_wwan.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wwan/iosm/iosm_ipc_wwan.c b/drivers/net/wwan/iosm/iosm_ipc_wwan.c -index 4712f01a7e33..2f1f8b5d5b59 100644 ---- a/drivers/net/wwan/iosm/iosm_ipc_wwan.c -+++ b/drivers/net/wwan/iosm/iosm_ipc_wwan.c -@@ -103,8 +103,8 @@ static int ipc_wwan_link_stop(struct net_device *netdev) - } - - /* Transmit a packet */ --static int ipc_wwan_link_transmit(struct sk_buff *skb, -- struct net_device *netdev) -+static netdev_tx_t ipc_wwan_link_transmit(struct sk_buff *skb, -+ struct net_device *netdev) - { - struct iosm_netdev_priv *priv = wwan_netdev_drvpriv(netdev); - struct iosm_wwan *ipc_wwan = priv->ipc_wwan; --- -2.35.1 - diff --git a/queue-6.0/net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch b/queue-6.0/net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch deleted file mode 100644 index 0337bb6e73d..00000000000 --- a/queue-6.0/net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c08ab8714d97020b2e528bd2b268a8474e9af9ce Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 12 Sep 2022 14:45:10 -0700 -Subject: net: wwan: t7xx: Fix return type of t7xx_ccmni_start_xmit - -From: Nathan Huckleberry - -[ Upstream commit 73c99e26036529e633a0f2d628ad7ddff6594668 ] - -The ndo_start_xmit field in net_device_ops is expected to be of type -netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). - -The mismatched return type breaks forward edge kCFI since the underlying -function definition does not match the function hook definition. - -The return type of t7xx_ccmni_start_xmit should be changed from int to -netdev_tx_t. - -Reported-by: Dan Carpenter -Link: https://github.com/ClangBuiltLinux/linux/issues/1703 -Cc: llvm@lists.linux.dev -Signed-off-by: Nathan Huckleberry -Acked-by: Sergey Ryazanov -Link: https://lore.kernel.org/r/20220912214510.929070-1-nhuck@google.com -Signed-off-by: Jakub Kicinski -Signed-off-by: Sasha Levin ---- - drivers/net/wwan/t7xx/t7xx_netdev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/net/wwan/t7xx/t7xx_netdev.c b/drivers/net/wwan/t7xx/t7xx_netdev.c -index c6b6547f2c6f..f71d3bc3b237 100644 ---- a/drivers/net/wwan/t7xx/t7xx_netdev.c -+++ b/drivers/net/wwan/t7xx/t7xx_netdev.c -@@ -74,7 +74,7 @@ static int t7xx_ccmni_send_packet(struct t7xx_ccmni *ccmni, struct sk_buff *skb, - return 0; - } - --static int t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev) -+static netdev_tx_t t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev) - { - struct t7xx_ccmni *ccmni = wwan_netdev_drvpriv(dev); - int skb_len = skb->len; --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index b6034f78825..a2a241a6500 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -763,13 +763,6 @@ wifi-mt76-mt7921-reset-msta-airtime_ac-while-clearin.patch wifi-rtw89-free-unused-skb-to-prevent-memory-leak.patch wifi-rtw89-fix-rx-filter-after-scan.patch bluetooth-l2cap-initialize-delayed-works-at-l2cap_ch.patch -net-ax88796c-fix-return-type-of-ax88796c_start_xmit.patch -net-davicom-fix-return-type-of-dm9000_start_xmit.patch -net-ethernet-ti-davinci_emac-fix-return-type-of-emac.patch -net-ethernet-litex-fix-return-type-of-liteeth_start_.patch -net-korina-fix-return-type-of-korina_send_packet.patch -net-wwan-iosm-fix-return-type-of-ipc_wwan_link_trans.patch -net-wwan-t7xx-fix-return-type-of-t7xx_ccmni_start_xm.patch bluetooth-hci_sysfs-fix-attempting-to-call-device_ad.patch bluetooth-hci_event-make-sure-iso-events-don-t-affec.patch wifi-ath10k-reset-pointer-after-memory-free-to-avoid.patch @@ -920,8 +913,6 @@ fsi-master-ast-cf-fix-missing-of_node_put-in-fsi_mas.patch dmaengine-dw-edma-remove-runtime-pm-support.patch usb-typec-ucsi-don-t-warn-on-probe-deferral.patch clk-bcm2835-round-uart-input-clock-up.patch -net-lan966x-fix-return-type-of-lan966x_port_xmit.patch -net-sparx5-fix-return-type-of-sparx5_port_xmit_impl.patch perf-skip-and-warn-on-unknown-format-confign-attrs.patch perf-intel-pt-fix-segfault-in-intel_pt_print_info-with-uclibc.patch perf-intel-pt-fix-system_wide-dummy-event-for-hybrid.patch