From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B644C6FA83 for ; Mon, 12 Sep 2022 19:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229767AbiILTx0 (ORCPT ); Mon, 12 Sep 2022 15:53:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbiILTxW (ORCPT ); Mon, 12 Sep 2022 15:53:22 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8450481EB for ; Mon, 12 Sep 2022 12:53:20 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id l12-20020a25ad4c000000b006a8e04c284dso8162810ybe.11 for ; Mon, 12 Sep 2022 12:53:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:from:subject:message-id:mime-version:date:from:to:cc:subject :date; bh=8sTMVM1/pnPvLF7fhqDPDLdOpTI5ZpSq4c3KVwZi7B8=; b=JrlBaDs0ZkKcl3Uk56oah+oPXYV2ZheDwVBv9jrNVxtlz2FH6mnmY94iYZRLTpQvUj 7z4vpjmWLtQ9sp9dMaKpR+9vgB/3Bs0vVXtV2zBtxtv0UXBzmxSixyyqsOKBePffgeF+ gco1M7LQLkIka0idwtLB3M/+4YJJBODTdHUC/nPD1Rk1xwISEXv/1c4VREAg+paaRPd8 xg7KQ5ck7FlWg4rall0Gfbr9I+UVotJKbbsyfPSw6LW18TaAks1aH7FXbKLEXvuKW1I5 vz+S69zmoF5F7yWO3/pOiUsk/rC1dSeGL1RL5pFgFvMKtVsG2aAMYzVTyD0e11Avzo5Q K9Mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date; bh=8sTMVM1/pnPvLF7fhqDPDLdOpTI5ZpSq4c3KVwZi7B8=; b=rgIzPGU5/uhBW3Bg5hWMI56F6dSlti01K612p4K63AefDYeTQyw6y1CcSBi/C401f3 6cqxE3nWtm2ZY9XuV05ub3VuxfTpNKPwxzeBN7OG5lEjJA6+oSajvQGnp0Y8nNJjsdAR pAPuwUwPgWcLhyz9Ba9wmvFeN6E0/GYgUOTa8/RgJf/N9lKuJdYBA/s19rLALve4GdiY oReLOYFdZVr+bglPcsZxKq+qCBB/cX8qzGvynTZ3er1ff6m7jmMJ8eIBTRY0uK+VJEh/ omz2cpirdDX0sAS7oknsw6xxMXr1WvkshAifXnaf8FgVmxr7YQBqZGIiX1K19G4Gv09c yoPA== X-Gm-Message-State: ACgBeo1pnApMJUgZs6FFNjGRTlVNlKxiOvXPbIC5YFhhx6LVVlrSeGTJ 8kwhYk/3tw3FSyLNtudaZYiM4fjyhg== X-Google-Smtp-Source: AA6agR5d/Z544jZbE1LJyu1uNB6Y1C9nJRr/wEWCLOd9x2ozjDBcAgqEPSE4cPer2KDWhrbbquOwyiMjSw== X-Received: from nhuck.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:39cc]) (user=nhuck job=sendgmr) by 2002:a05:6902:1507:b0:6af:9e7:f947 with SMTP id q7-20020a056902150700b006af09e7f947mr6155067ybu.649.1663012399165; Mon, 12 Sep 2022 12:53:19 -0700 (PDT) Date: Mon, 12 Sep 2022 12:53:07 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220912195307.812229-1-nhuck@google.com> Subject: [PATCH] net: ethernet: litex: Fix return type of liteeth_start_xmit From: Nathan Huckleberry Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Karol Gugala , Mateusz Holenko , Gabriel Somlo , Joel Stanley , Nathan Chancellor , Nick Desaulniers , Tom Rix , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Link: https://github.com/ClangBuiltLinux/linux/issues/1703 Cc: llvm@lists.linux.dev Signed-off-by: Nathan Huckleberry --- 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