mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 21:44:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723bs: Fix return type for implementation of ndo_start_xmit

Browse Source 
CFI (Control Flow Integrity) is a safety feature allowing the system to
detect and react should a potential control flow hijacking occurs. In
particular, the Forward-Edge CFI protects indirect function calls by
ensuring the prototype of function that is actually called matches the
definition of the function hook.

Since Linux now supports CFI, it will be a good idea to fix mismatched
return type for implementation of hooks. Otherwise this would get
cought out by CFI and cause a panic.

Use enums from netdev_tx_t as return value instead. Then change return
type to netdev_tx_t.

Fixes: cf68fffb66 ("add support for Clang CFI")
Signed-off-by: GUO Zihua <guozihua@huawei.com>
Link: https://lore.kernel.org/r/20220909082048.14486-3-guozihua@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
GUO Zihua
2022-09-09 16:20:48 +08:00
committed by Greg Kroah-Hartman
parent 5bf83bef3b
commit a90044ef56
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/rtl8723bs/include/xmit_osdep.h
View File

@@ -26,7 +26,7 @@ struct xmit_frame;
struct xmit_buf;
extern void _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
extern int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
extern netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev);
void rtw_os_xmit_schedule(struct adapter *padapter);

4
drivers/staging/rtl8723bs/os_dep/xmit_linux.c
View File

@@ -217,10 +217,10 @@ void _rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev)
dev_kfree_skb_any(pkt);
}
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)
{
if (pkt)
_rtw_xmit_entry(pkt, pnetdev);
return 0;
return NETDEV_TX_OK;
}