From: Nathan Chancellor <nathan@kernel.org>
To: Nathan Huckleberry <nhuck@google.com>
Cc: namcaov@gmail.com, Larry.Finger@lwfinger.net, error27@gmail.com,
gregkh@linuxfoundation.org, insafonov@gmail.com,
linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev,
llvm@lists.linux.dev, makvihas@gmail.com,
ndesaulniers@google.com, paskripkin@gmail.com,
phil@philpotter.co.uk, saurav.girepunje@gmail.com,
trix@redhat.com
Subject: Re: [PATCH v2] staging: r8188eu: Fix return type of rtw_xmit_entry
Date: Tue, 13 Sep 2022 16:16:56 -0700 [thread overview]
Message-ID: <YyEPaMVRmdGQdoql@dev-arch.thelio-3990X> (raw)
In-Reply-To: <20220913193322.18776-1-nhuck@google.com>
On Tue, Sep 13, 2022 at 12:33:22PM -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/r8188eu/include/xmit_osdep.h should be
updated as well. With that:
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> Changes v1 -> v2:
> - Rebased onto linux-next/master
>
> ---
> drivers/staging/r8188eu/core/rtw_xmit.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
> index 98864fc55b25..ea13f11b231b 100644
> --- a/drivers/staging/r8188eu/core/rtw_xmit.c
> +++ b/drivers/staging/r8188eu/core/rtw_xmit.c
> @@ -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;
> }
> --
> 2.37.2.789.g6183377224-goog
>
next prev parent reply other threads:[~2022-09-13 23:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 21:45 [PATCH] staging: r8188eu: Fix return type of rtw_xmit_entry Nathan Huckleberry
2022-09-13 6:32 ` Nam Cao
2022-09-13 19:33 ` [PATCH v2] " Nathan Huckleberry
2022-09-13 23:16 ` Nathan Chancellor [this message]
2022-09-14 21:16 ` [PATCH v3] " Nathan Huckleberry
2022-09-15 5:22 ` Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YyEPaMVRmdGQdoql@dev-arch.thelio-3990X \
--to=nathan@kernel.org \
--cc=Larry.Finger@lwfinger.net \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=insafonov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=llvm@lists.linux.dev \
--cc=makvihas@gmail.com \
--cc=namcaov@gmail.com \
--cc=ndesaulniers@google.com \
--cc=nhuck@google.com \
--cc=paskripkin@gmail.com \
--cc=phil@philpotter.co.uk \
--cc=saurav.girepunje@gmail.com \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).