Skip to contentSkip to conversation

staging: rtl8712: Fix return type of r8712_xmit_entry

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

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8712: Fix return type of r8712_xmit_entry

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

---
 drivers/staging/rtl8712/xmit_linux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/xmit_linux.c +3 -3
index 4a93839bf947..e84b9fa231cd 100644
@@ -140,7 +140,7 @@ void r8712_xmit_complete(struct _adapter *padapter, struct xmit_frame *pxframe)
 	pxframe->pkt = NULL;
 }
 
-int r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
+netdev_tx_t r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
 {
 	struct xmit_frame *xmitframe = NULL;
 	struct _adapter *adapter = netdev_priv(netdev);
@@ -165,11 +165,11 @@ int r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
 	}
 	xmitpriv->tx_pkts++;
 	xmitpriv->tx_bytes += xmitframe->attrib.last_txcmdsz;
-	return 0;
+	return NETDEV_TX_OK;
 _xmit_entry_drop:
 	if (xmitframe)
 		r8712_free_xmitframe(xmitpriv, xmitframe);
 	xmitpriv->tx_drop++;
 	dev_kfree_skb_any(pkt);
-	return 0;
+	return NETDEV_TX_OK;
 }
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 r8712_xmit_entry should be changed from int to netdev_tx_t.

The prototype in drivers/staging/rtl8712/xmit_osdep.h should be updated as well. With that:

Quoted 34 lines
---
 drivers/staging/rtl8712/xmit_linux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/xmit_linux.c +3 -3
index 4a93839bf947..e84b9fa231cd 100644
@@ -140,7 +140,7 @@ void r8712_xmit_complete(struct _adapter *padapter, struct xmit_frame *pxframe)
 	pxframe->pkt = NULL;
 }
 
-int r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
+netdev_tx_t r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
 {
 	struct xmit_frame *xmitframe = NULL;
 	struct _adapter *adapter = netdev_priv(netdev);
@@ -165,11 +165,11 @@ int r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
 	}
 	xmitpriv->tx_pkts++;
 	xmitpriv->tx_bytes += xmitframe->attrib.last_txcmdsz;
-	return 0;
+	return NETDEV_TX_OK;
 _xmit_entry_drop:
 	if (xmitframe)
 		r8712_free_xmitframe(xmitpriv, xmitframe);
 	xmitpriv->tx_drop++;
 	dev_kfree_skb_any(pkt);
-	return 0;
+	return NETDEV_TX_OK;
 }
Signature · 1 line
2.37.2.789.g6183377224-goog
#2 lore raw

Looks like this was already fixed in 307d343620e1fc7a6a2b7a1cdadb705532c9b6a5

Ignore this patch.

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

The prototype in drivers/staging/rtl8712/xmit_osdep.h should be updated as well. With that:

Quoted 34 lines
---
 drivers/staging/rtl8712/xmit_linux.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/rtl8712/xmit_linux.c +3 -4
index 4a93839bf947..e84b9fa231cd 100644
@@ -140,7 +140,7 @@ void r8712_xmit_complete(struct _adapter *padapter, struct xmit_frame *pxframe)
      pxframe->pkt = NULL;
 }
 
-int r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
+netdev_tx_t r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
 {
      struct xmit_frame *xmitframe = NULL;
      struct _adapter *adapter = netdev_priv(netdev);
@@ -165,11 +165,11 @@ int r8712_xmit_entry(_pkt *pkt, struct  net_device *netdev)
      }
      xmitpriv->tx_pkts++;
      xmitpriv->tx_bytes += xmitframe->attrib.last_txcmdsz;
-     return 0;
+     return NETDEV_TX_OK;
 _xmit_entry_drop:
      if (xmitframe)
              r8712_free_xmitframe(xmitpriv, xmitframe);
      xmitpriv->tx_drop++;
      dev_kfree_skb_any(pkt);
-     return 0;
+     return NETDEV_TX_OK;
 }
--

2.37.2.789.g6183377224-goog