lkml.org 
[lkml]   [2022]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.19 43/73] net: davicom: Fix return type of dm9000_start_xmit
    Date
    From: Nathan Huckleberry <nhuck@google.com>

    [ Upstream commit 0191580b000d50089a0b351f7cdbec4866e3d0d2 ]

    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 dm9000_start_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>
    Reviewed-by: Nathan Chancellor <nathan@kernel.org>
    Link: https://lore.kernel.org/r/20220912194722.809525-1-nhuck@google.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/davicom/dm9000.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/davicom/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
    index 0985ab216566..186a5e0a7862 100644
    --- a/drivers/net/ethernet/davicom/dm9000.c
    +++ b/drivers/net/ethernet/davicom/dm9000.c
    @@ -1012,7 +1012,7 @@ static void dm9000_send_packet(struct net_device *dev,
    * Hardware start transmission.
    * Send a packet to media from the upper layer.
    */
    -static int
    +static netdev_tx_t
    dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)
    {
    unsigned long flags;
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-10-10 00:31    [W:4.121 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site