Skip to contentSkip to conversation

staging: rtl8192u: Fix return type of ieee80211_xmit

PATCH Superseded Nathan Huckleberry 2 participants 4 messages Sep 12, 2022 – Sep 14, 2022 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8192u: Fix return type of ieee80211_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 ieee80211_xmit should be changed from int to netdev_tx_t.

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +3 -3
index 8602e3a6c837..e4b6454809a0 100644
@@ -526,7 +526,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
 	}
 }
 
-int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct ieee80211_device *ieee = netdev_priv(dev);
 	struct ieee80211_txb *txb = NULL;
@@ -822,13 +822,13 @@ int ieee80211_xmit(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;
 			}
 			ieee80211_txb_free(txb);
 		}
 	}
 
-	return 0;
+	return NETDEV_TX_OK;
 
  failed:
 	spin_unlock_irqrestore(&ieee->lock, flags);
Signature · 1 line
2.37.2.789.g6183377224-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 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.

Quoted 7 lines

The return type of ieee80211_xmit should be changed from int to netdev_tx_t.

The protoype in drivers/staging/rtl8192u/ieee80211/ieee80211.h should be updated as well. With that:

Quoted 23 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +2 -2
index 8602e3a6c837..e4b6454809a0 100644
@@ -526,7 +526,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
 	}
 }
 
-int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct ieee80211_device *ieee = netdev_priv(dev);
 	struct ieee80211_txb *txb = NULL;
@@ -822,13 +822,13 @@ int ieee80211_xmit(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;

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) · line 834

Quoted 10 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +1 -1
 			}
 			ieee80211_txb_free(txb);
 		}
 	}
 
-	return 0;
+	return NETDEV_TX_OK;
 
  failed:
 	spin_unlock_irqrestore(&ieee->lock, flags);

I see 'return 1' down here, that doesn't appear to be a valid 'netdev_tx_t'. Should that be 'return NETDEV_TX_BUSY'? I guess that is an outstanding issue though, just figured I would mention it.

Quoted 3 lines
Signature · 1 line
2.37.2.789.g6183377224-goog

Cheers,
Nathan

#2 lore raw

Hey Nathan,

Quoted 11 lines · Nathan Chancellor
Quoted 9 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 ieee80211_xmit should be changed from int to netdev_tx_t.

Quoted 7 lines
Quoted 4 lines

The protoype in drivers/staging/rtl8192u/ieee80211/ieee80211.h should be updated as well. With that:

Nice catch, thanks.

Quoted 34 lines
Quoted 31 lines
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +3 -3
index 8602e3a6c837..e4b6454809a0 100644
@@ -526,7 +526,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
      }
 }
 
-int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
 {
      struct ieee80211_device *ieee = netdev_priv(dev);
      struct ieee80211_txb *txb = NULL;
@@ -822,13 +822,13 @@ int ieee80211_xmit(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;
                      }
                      ieee80211_txb_free(txb);
              }
      }
 
-     return 0;
+     return NETDEV_TX_OK;
 
Quoted 6 lines

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) · line 834

Quoted 2 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +0 -0
  failed:
      spin_unlock_irqrestore(&ieee->lock, flags);

I see 'return 1' down here, that doesn't appear to be a valid 'netdev_tx_t'. Should that be 'return NETDEV_TX_BUSY'? I guess that is an outstanding issue though, just figured I would mention it.

I'm not sure. As far as I can tell, the dev_xmit_complete function in include/linux/netdevice.h is used to determine whether an skb was consumed or not. It looks like a value of 1 (NET_XMIT_DROP) would signify that it was consumed, whereas NETDEV_TX_BUSY would not.

It's somewhat confusing that a function which returns an enum may also return values outside of that enum.

For more info see the foillowing commits:
dc1f8bf68b311b1537cb65893430b6796118498a
572a9d7b6fc7f20f573664063324c086be310c42
7f2e870f2a48a0524a3b03b04fa019311d16a7f7

Quoted 7 lines
Quoted 4 lines

--
2.37.2.789.g6183377224-goog

Cheers,
Nathan

Thanks,
Huck

#3 lore raw

PATCH v2 1/1 staging: rtl8192u: Fix return type of ieee80211_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 ieee80211_xmit should be changed from int to netdev_tx_t.

---

Changes v1 -> v2:
- Updated header file
- Added reviewed-by tag

 drivers/staging/rtl8192u/ieee80211/ieee80211.h    | 2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211.h +1 -1
index b577f9c81f85..9cd4b1896745 100644
@@ -2178,7 +2178,7 @@ int ieee80211_set_encryption(struct ieee80211_device *ieee);
 int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
 			       struct sk_buff *frag, int hdr_len);
 
-int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev);
+netdev_tx_t ieee80211_xmit(struct sk_buff *skb, struct net_device *dev);
 void ieee80211_txb_free(struct ieee80211_txb *txb);
 
 
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +3 -3
index 8602e3a6c837..e4b6454809a0 100644
@@ -526,7 +526,7 @@ static void ieee80211_query_seqnum(struct ieee80211_device *ieee,
 	}
 }
 
-int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct ieee80211_device *ieee = netdev_priv(dev);
 	struct ieee80211_txb *txb = NULL;
@@ -822,13 +822,13 @@ int ieee80211_xmit(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;
 			}
 			ieee80211_txb_free(txb);
 		}
 	}
 
-	return 0;
+	return NETDEV_TX_OK;
 
  failed:
 	spin_unlock_irqrestore(&ieee->lock, flags);
Signature · 1 line
2.37.2.789.g6183377224-goog