staging: rtl8723bs: Fix rtw_xmit_entry return type
PATCH 1/1 staging: rtl8723bs: Fix rtw_xmit_entry return type
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/rtl8723bs/os_dep/xmit_linux.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/staging/rtl8723bs/os_dep/xmit_linux.c +5 -8
@@ -181,7 +181,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 =rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -217,15 +217,12 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; } -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) { -int ret =0 ; -if (pkt) - ret =_rtw_xmit_entry (pkt, pnetdev); - -return ret; +return _rtw_xmit_entry (pkt, pnetdev); +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/rtl8723bs/include/xmit_osdep.h should be updated as well. With that:
Quoted 40 lines
--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)drivers/staging/rtl8723bs/os_dep/xmit_linux.c +5
-8@@ -181,7 +181,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 =rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;@@ -217,15 +217,12 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; } -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) { -int ret =0 ; -if (pkt) - ret =_rtw_xmit_entry (pkt, pnetdev); - -return ret; +return _rtw_xmit_entry (pkt, pnetdev); +return NETDEV_TX_OK ; }Signature · 1 line
2.37.2.789.g6183377224-goog
Looks like this was already fixed in a90044ef5605bc0961356548526c44964bc819a7
Ignore this patch.
Quoted 61 lines · Nathan Chancellor
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/rtl8723bs/include/xmit_osdep.hshould be updated as well. With that:Reviewed-by Nathan Chancellor <[email protected]>Quoted 40 lines
--- drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)drivers/staging/rtl8723bs/os_dep/xmit_linux.c +5
-9@@ -181,7 +181,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 =rtw_netdev_priv (pnetdev);struct xmit_priv *pxmitpriv = &padapter->xmitpriv;@@ -217,15 +217,12 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)dev_kfree_skb_any (pkt); exit: -return 0 ; +return NETDEV_TX_OK ; } -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) { -int ret =0 ; -if (pkt) - ret =_rtw_xmit_entry (pkt, pnetdev); - -return ret; +return _rtw_xmit_entry (pkt, pnetdev); +return NETDEV_TX_OK ; } --2.37.2.789.g6183377224-goog