2022-09-13 22:49:09

by Nathan Chancellor

Subject: Re: [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit

On Mon, Sep 12, 2022 at 12:53:07PM -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 liteeth_start_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]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
> index fdd99f0de424..35f24e0f0934 100644
> --- a/drivers/net/ethernet/litex/litex_liteeth.c
> +++ b/drivers/net/ethernet/litex/litex_liteeth.c
> @@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
> return 0;
> }
>
> -static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
> +static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
> + struct net_device *netdev)
> {
> struct liteeth *priv = netdev_priv(netdev);
> void __iomem *txbuffer;
> --
> 2.37.2.789.g6183377224-goog
>

2022-09-14 12:19:45

by Gabriel L. Somlo

Subject: Re: [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit

On Tue, Sep 13, 2022 at 03:31:11PM -0700, Nathan Chancellor wrote:
> On Mon, Sep 12, 2022 at 12:53:07PM -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 liteeth_start_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]>
>
> Reviewed-by: Nathan Chancellor <[email protected]>

Acked-by: Gabriel Somlo <[email protected]>

Thanks,
--G


> > ---
> > drivers/net/ethernet/litex/litex_liteeth.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
> > index fdd99f0de424..35f24e0f0934 100644
> > --- a/drivers/net/ethernet/litex/litex_liteeth.c
> > +++ b/drivers/net/ethernet/litex/litex_liteeth.c
> > @@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
> > return 0;
> > }
> >
> > -static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
> > +static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
> > + struct net_device *netdev)
> > {
> > struct liteeth *priv = netdev_priv(netdev);
> > void __iomem *txbuffer;
> > --
> > 2.37.2.789.g6183377224-goog
> >