From: Nathan Chancellor <nathan@kernel.org>
To: Nathan Huckleberry <nhuck@google.com>
Cc: Dan Carpenter <error27@gmail.com>,
llvm@lists.linux.dev,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Tom Rix <trix@redhat.com>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] staging: octeon: Fix return type of cvm_oct_xmit and cvm_oct_xmit_pow
Date: Tue, 13 Sep 2022 15:35:39 -0700 [thread overview]
Message-ID: <YyEFu8uzoxK64p0Y@dev-arch.thelio-3990X> (raw)
In-Reply-To: <YyEFNA3nVShxwkJT@dev-arch.thelio-3990X>
On Tue, Sep 13, 2022 at 03:33:24PM -0700, Nathan Chancellor wrote:
> On Mon, Sep 12, 2022 at 02:45:20PM -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 cvm_oct_xmit and cvm_oct_xmit_pow 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>
>
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Sorry, forgot to point out that the prototypes in
drivers/staging/octeon/ethernet-tx.h should be updated as well.
> > ---
> > drivers/staging/octeon/ethernet-tx.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
> > index 1ad94c5060b5..a36e36701c74 100644
> > --- a/drivers/staging/octeon/ethernet-tx.c
> > +++ b/drivers/staging/octeon/ethernet-tx.c
> > @@ -125,7 +125,7 @@ static void cvm_oct_free_tx_skbs(struct net_device *dev)
> > *
> > * Returns Always returns NETDEV_TX_OK
> > */
> > -int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
> > +netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
> > {
> > union cvmx_pko_command_word0 pko_command;
> > union cvmx_buf_ptr hw_buffer;
> > @@ -506,7 +506,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
> > * @dev: Device info structure
> > * Returns Always returns zero
> > */
> > -int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
> > +netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev)
> > {
> > struct octeon_ethernet *priv = netdev_priv(dev);
> > void *packet_buffer;
> > --
> > 2.37.2.789.g6183377224-goog
> >
>
next prev parent reply other threads:[~2022-09-13 22:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-12 21:45 Nathan Huckleberry
2022-09-13 22:33 ` Nathan Chancellor
2022-09-13 22:35 ` Nathan Chancellor [this message]
2022-09-13 23:04 ` [PATCH v2] " Nathan Huckleberry
2022-09-13 23:22 ` Nathan Chancellor
2022-09-14 21:10 ` [PATCH v3] " Nathan Huckleberry
2022-09-15 8:21 ` Arnd Bergmann
2022-09-15 9:09 ` Dan Carpenter
2022-09-15 12:03 ` Arnd Bergmann
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=YyEFu8uzoxK64p0Y@dev-arch.thelio-3990X \
--to=nathan@kernel.org \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=llvm@lists.linux.dev \
--cc=ndesaulniers@google.com \
--cc=nhuck@google.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
all inboxes | Powered by JetHome®