staging: r8188eu: Fix return type of rtw_xmit_entry
PATCH 1/1 staging: r8188eu: Fix return type of rtw_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 rtw_xmit_entry should be changed from int to netdev_tx_t.
--- drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/os_dep/xmit_linux.c +2 -2
@@ -198,7 +198,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)return true; } -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -233,5 +233,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) exit: -return 0 ; +return NETDEV_TX_OK ; }
Signature · 1 line
2.37.2.789.g6183377224-goog
Quoted 7 lines · Nathan Huckleberry
The
ndo_start_xmitfield innet_device_opsis expected to be of typenetdev_tx_t(*ndo_start_xmit)(structsk_buff*skb, structnet_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
rtw_xmit_entryshould be changed from int tonetdev_tx_t.
I am unable to apply your patch. I think because of this:3e0a6c4414ac ("staging: r8188eu: remove os_dep/xmit_linux.c").
Can you update your git repo and resubmit?
Best regards,
Nam
PATCH v2 1/1 staging: r8188eu: Fix return type of rtw_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 rtw_xmit_entry should be changed from int to netdev_tx_t.
Changes v1 -> v2:
- Rebased onto linux-next/master
--- drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_xmit.c +2 -2
@@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)return true; } -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; }
Signature · 1 line
2.37.2.789.g6183377224-goog
Quoted 6 lines · Nathan Huckleberry
The
ndo_start_xmitfield innet_device_opsis expected to be of typenetdev_tx_t(*ndo_start_xmit)(structsk_buff*skb, structnet_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
rtw_xmit_entryshould be changed from int tonetdev_tx_t.
The prototype in drivers/staging/r8188eu/include/xmit_osdep.h should be updated as well. With that:
Quoted 30 lines
Changes v1 -> v2:
- Rebased onto linux-next/master--- drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/staging/r8188eu/core/rtw_xmit.c +2
-2@@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)return true; } -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;@@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; }Signature · 1 line
2.37.2.789.g6183377224-goog
PATCH v3 1/1 staging: r8188eu: Fix return type of rtw_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 rtw_xmit_entry should be changed from int to netdev_tx_t.
---
Changes v1 -> v2:
- Rebased onto linux-next/master
Changes v2 -> v3:
- Updated header file
- Add reviewed-by tag
drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/staging/r8188eu/core/rtw_xmit.c +2 -2
@@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)return true; } -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; }
drivers/staging/r8188eu/include/rtw_xmit.h +1 -1
@@ -368,6 +368,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);void rtw_ack_tx_done (struct xmit_priv *pxmitpriv,int status);void rtw_xmit_complete (struct adapter *padapter,struct xmit_frame *pxframe); -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev); +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev);#endif /* _RTL871X_XMIT_H_ */
Signature · 1 line
2.37.2.789.g6183377224-goog
Quoted 52 lines · Nathan Huckleberry
The
ndo_start_xmitfield innet_device_opsis expected to be of typenetdev_tx_t(*ndo_start_xmit)(structsk_buff*skb, structnet_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
rtw_xmit_entryshould be changed from int tonetdev_tx_t.Reported-by Dan Carpenter <[email protected]>Signed-off-by Nathan Huckleberry <[email protected]>Reviewed-by Nathan Chancellor <[email protected]>---
Changes v1 -> v2:
- Rebased onto linux-next/masterChanges v2 -> v3:
- Updated header file
- Add reviewed-by tagdrivers/staging/r8188eu/core/rtw_xmit.c | 4 ++-- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/staging/r8188eu/core/rtw_xmit.c +2
-2@@ -2289,7 +2289,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)return true; } -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;@@ -2323,5 +2323,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; }drivers/staging/r8188eu/include/rtw_xmit.h +0
-0
drivers/staging/r8188eu/include/rtw_xmit.h int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms); · line 373
Quoted 7 lines
drivers/staging/r8188eu/include/rtw_xmit.h +1
-1@@ -368,6 +368,6 @@ int rtw_ack_tx_wait(struct xmit_priv *pxmitpriv, u32 timeout_ms);void rtw_ack_tx_done (struct xmit_priv *pxmitpriv,int status);void rtw_xmit_complete (struct adapter *padapter,struct xmit_frame *pxframe); -int rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev); +netdev_tx_t rtw_xmit_entry (struct sk_buff *pkt,struct net_device *pnetdev);#endif /* _RTL871X_XMIT_H_ */