Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20220912214548.929144-1-nhuck@google.com> <3b60a44b-2868-ba93-bb0c-d937a209f03e@gmail.com>
In-Reply-To: <3b60a44b-2868-ba93-bb0c-d937a209f03e@gmail.com>
From:   Nathan Huckleberry <nhuck@google.com>
Date:   Tue, 13 Sep 2022 12:17:29 -0700
Message-ID: <CAJkfWY5O56kWhBa1XP4auMLEVJpn9OEi__p6oVQXSYw0ac2_7Q@mail.gmail.com>
Subject: Re: [PATCH] Staging: rtl8192e: Fix return type of rtllib_xmit
To:     Philipp Hortmann <philipp.g.hortmann@gmail.com>
Cc:     Dan Carpenter <error27@gmail.com>, llvm@lists.linux.dev,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Tom Rix <trix@redhat.com>,
        Felix Schlepper <f3sch.git@outlook.com>,
        linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Looks like this has already been fixed in commit
513d9a61156d79dd0979c4ad400c8587f52cbb9d

On Tue, Sep 13, 2022 at 11:48 AM Philipp Hortmann
<philipp.g.hortmann@gmail.com> 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<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/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