2022-09-13 19:06:56

by Philipp Hortmann

Subject: Re: [PATCH] Staging: rtl8192e: Fix return type of rtllib_xmit

On 9/12/22 23:45, 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 rtllib_xmit should be changed from int to
> netdev_tx_t.
>
> Reported-by: Dan Carpenter<[email protected]>
> Link:https://github.com/ClangBuiltLinux/linux/issues/1703
> Cc:[email protected]
> Signed-off-by: Nathan Huckleberry<[email protected]>
> ---
> drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
> index 42f81b23a144..1b665afd309e 100644
> --- a/drivers/staging/rtl8192e/rtllib_tx.c
> +++ b/drivers/staging/rtl8192e/rtllib_tx.c

Hi,

I cannot apply your patch.

Applying: Staging: rtl8192e: Fix return type of rtllib_xmit
error: patch failed: drivers/staging/rtl8192e/rtllib_tx.c:962
error: drivers/staging/rtl8192e/rtllib_tx.c: patch does not apply
Patch failed at 0001 Staging: rtl8192e: Fix return type of rtllib_xmit

git remote show origin
* remote origin
Fetch URL:
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
...
my branch: staging-testing

Bye Philipp

2022-09-13 19:29:11

by Nathan Huckleberry

Subject: Re: [PATCH] Staging: rtl8192e: Fix return type of rtllib_xmit

Looks like this has already been fixed in commit
513d9a61156d79dd0979c4ad400c8587f52cbb9d

On Tue, Sep 13, 2022 at 11:48 AM Philipp Hortmann
<[email protected]> wrote:
>
> On 9/12/22 23:45, 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 rtllib_xmit should be changed from int to
> > netdev_tx_t.
> >
> > Reported-by: Dan Carpenter<[email protected]>
> > Link:https://github.com/ClangBuiltLinux/linux/issues/1703
> > Cc:[email protected]
> > Signed-off-by: Nathan Huckleberry<[email protected]>
> > ---
> > drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
> > index 42f81b23a144..1b665afd309e 100644
> > --- a/drivers/staging/rtl8192e/rtllib_tx.c
> > +++ b/drivers/staging/rtl8192e/rtllib_tx.c
>
> Hi,
>
> I cannot apply your patch.
>
> Applying: Staging: rtl8192e: Fix return type of rtllib_xmit
> error: patch failed: drivers/staging/rtl8192e/rtllib_tx.c:962
> error: drivers/staging/rtl8192e/rtllib_tx.c: patch does not apply
> Patch failed at 0001 Staging: rtl8192e: Fix return type of rtllib_xmit
>
> git remote show origin
> * remote origin
> Fetch URL:
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
> ...
> my branch: staging-testing
>
> Bye Philipp