Skip to contentSkip to conversation

Staging: rtl8192e: Fix return type of rtllib_xmit

PATCH In review Nathan Huckleberry 2 participants 3 messages Sep 12, 2022 – Sep 13, 2022 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8192e: Fix return type of rtllib_xmit

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 rtllib_xmit should be changed from int to netdev_tx_t.

---
 drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtllib_tx.c +4 -4
index 42f81b23a144..1b665afd309e 100644
@@ -543,7 +543,7 @@ static u8 rtllib_current_rate(struct rtllib_device *ieee)
 		return ieee->rate & 0x7F;
 }
 
-static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
 {
 	struct rtllib_device *ieee = (struct rtllib_device *)
 				     netdev_priv_rsl(dev);
@@ -946,13 +946,13 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
 			if ((*ieee->hard_start_xmit)(txb, dev) == 0) {
 				stats->tx_packets++;
 				stats->tx_bytes += le16_to_cpu(txb->payload_size);
-				return 0;
+				return NETDEV_TX_OK;
 			}
 			rtllib_txb_free(txb);
 		}
 	}
 
-	return 0;
+	return NETDEV_TX_OK;
 
  failed:
 	spin_unlock_irqrestore(&ieee->lock, flags);
@@ -962,7 +962,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struct net_device *dev)
 
 }
 
-int rtllib_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t rtllib_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	memset(skb->cb, 0, sizeof(skb->cb));
 	return rtllib_xmit_inter(skb, dev);
Signature · 1 line
2.37.2.789.g6183377224-goog
#1 lore raw

drivers/staging/rtl8192e/rtllib_tx.c

Quoted 21 lines · Nathan Huckleberry

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 rtllib_xmit should be changed from int to netdev_tx_t.

---
  drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtllib_tx.c +0 -0
index 42f81b23a144..1b665afd309e 100644

Hi,

I cannot apply your patch.

Applying: Staging: rtl8192e: Fix return type of rtllib_xmit
error: patch failed: drivers/staging/rtl8192e/rtllib_tx.c:962
error: drivers/staging/rtl8192e/rtllib_tx.c: patch does not apply Patch failed at 0001 Staging: rtl8192e: Fix return type of rtllib_xmit

git remote show origin
* remote origin
Fetch URL:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
...
my branch: staging-testing

Bye Philipp

#2 lore raw

Looks like this has already been fixed in commit
513d9a61156d79dd0979c4ad400c8587f52cbb9d

Quoted 41 lines · Philipp Hortmann

drivers/staging/rtl8192e/rtllib_tx.c

Quoted 21 lines · Nathan Huckleberry

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 rtllib_xmit should be changed from int to netdev_tx_t.

---
  drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192e/rtllib_tx.c +0 -0
index 42f81b23a144..1b665afd309e 100644

Hi,

I cannot apply your patch.

Applying: Staging: rtl8192e: Fix return type of rtllib_xmit
error: patch failed: drivers/staging/rtl8192e/rtllib_tx.c:962
error: drivers/staging/rtl8192e/rtllib_tx.c: patch does not apply Patch failed at 0001 Staging: rtl8192e: Fix return type of rtllib_xmit

git remote show origin
* remote origin
Fetch URL:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
...
my branch: staging-testing

Bye Philipp