* [PATCH] staging: rtl8723bs: Fix rtw_xmit_entry return type
@ 2022-09-12 21:46 Nathan Huckleberry
2022-09-13 23:14 ` Nathan Chancellor
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Huckleberry @ 2022-09-12 21:46 UTC (permalink / raw)
Cc: Nathan Huckleberry, Dan Carpenter, llvm, Greg Kroah-Hartman,
Nathan Chancellor, Nick Desaulniers, Tom Rix, linux-staging,
linux-kernel
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.
Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1703
Cc: llvm@lists.linux.dev
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
---
drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
index 530e7a6c67c5..472d3ac0179b 100644
--- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
@@ -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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Fix rtw_xmit_entry return type
2022-09-12 21:46 [PATCH] staging: rtl8723bs: Fix rtw_xmit_entry return type Nathan Huckleberry
@ 2022-09-13 23:14 ` Nathan Chancellor
2022-09-14 19:14 ` Nathan Huckleberry
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2022-09-13 23:14 UTC (permalink / raw)
To: Nathan Huckleberry
Cc: Dan Carpenter, llvm, Greg Kroah-Hartman, Nick Desaulniers,
Tom Rix, linux-staging, linux-kernel
On Mon, Sep 12, 2022 at 02:46:14PM -0700, Nathan Huckleberry wrote:
> 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.
>
> Reported-by: Dan Carpenter <error27@gmail.com>
> Link: https://github.com/ClangBuiltLinux/linux/issues/1703
> Cc: llvm@lists.linux.dev
> Signed-off-by: Nathan Huckleberry <nhuck@google.com>
The prototype in drivers/staging/rtl8723bs/include/xmit_osdep.h should
be updated as well. With that:
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
> index 530e7a6c67c5..472d3ac0179b 100644
> --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
> +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
> @@ -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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: rtl8723bs: Fix rtw_xmit_entry return type
2022-09-13 23:14 ` Nathan Chancellor
@ 2022-09-14 19:14 ` Nathan Huckleberry
0 siblings, 0 replies; 3+ messages in thread
From: Nathan Huckleberry @ 2022-09-14 19:14 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Dan Carpenter, llvm, Greg Kroah-Hartman, Nick Desaulniers,
Tom Rix, linux-staging, linux-kernel
Looks like this was already fixed in a90044ef5605bc0961356548526c44964bc819a7
Ignore this patch.
On Tue, Sep 13, 2022 at 4:14 PM Nathan Chancellor <nathan@kernel.org> wrote:
>
> On Mon, Sep 12, 2022 at 02:46:14PM -0700, Nathan Huckleberry wrote:
> > 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.
> >
> > Reported-by: Dan Carpenter <error27@gmail.com>
> > Link: https://github.com/ClangBuiltLinux/linux/issues/1703
> > Cc: llvm@lists.linux.dev
> > Signed-off-by: Nathan Huckleberry <nhuck@google.com>
>
> The prototype in drivers/staging/rtl8723bs/include/xmit_osdep.h should
> be updated as well. With that:
>
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
>
> > ---
> > drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 13 +++++--------
> > 1 file changed, 5 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
> > index 530e7a6c67c5..472d3ac0179b 100644
> > --- a/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
> > +++ b/drivers/staging/rtl8723bs/os_dep/xmit_linux.c
> > @@ -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
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-14 19:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-12 21:46 [PATCH] staging: rtl8723bs: Fix rtw_xmit_entry return type Nathan Huckleberry
2022-09-13 23:14 ` Nathan Chancellor
2022-09-14 19:14 ` Nathan Huckleberry
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox