From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7809538D for ; Mon, 12 Sep 2022 21:44:26 +0000 (UTC) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-3454647ff7dso85605907b3.12 for ; Mon, 12 Sep 2022 14:44:26 -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=0Wdj+RXvtzSTWVCBC3E7Qvw8dMmiW0pb/ksTMDuYAvw=; b=Ajm7KGtZDxaAtqs155/MmwWxM6UwHlfv1/ltpg+APIwxnT3r1WoPDzMRNnoIeGMDkw qba7V8fAUK6z4GU96imY+n5v3zq+Hr5EeWufMvmssnHW6fprfNZ2r+cGy4TBm8sTXwQO qndhToQiip1Kl1SPvNUYQ4hZCiZHTXmX3O9JPLYQzdY+ePhKiwI3bDCgI19IivD1bXUg 9WlsJwSPOhsTAJTaqe+uYOqIihE0wjLV6yYLFI7LB7XC36wBe6i7016KvDjl8vb9pvzL R2vnULoJLvkasYdaL+LI+MYrtV3wDegDJeE+xdE6rjWS4uBQyKKJNQgGYJA7A8Ucug5w Qp2w== 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=0Wdj+RXvtzSTWVCBC3E7Qvw8dMmiW0pb/ksTMDuYAvw=; b=pJrWox+uI+X1khfwmGPgD8CjDlBzWSp3XjwaypnEiZ4MyyvpztEFLMhxEfcCdYVOdG G0RU2dI+GbidVmMtpAYmD0avYdMicDkPTtPl6tanNIYWLK3kUhCZSPtfacbfvC6C+9w/ z0QLGnwqExltXFg6SyZnCQKYoBVlAMJF1F/qWVCT10Q4JCUN/vB22stslLsgcueoMtV7 1Ra/Mmv66XXAaGmq+X6qnDP4jghikd3A2DYKsGhfDf+nYnUCj4bLD1kh/dy1ogSQSK1n wXQloqArrVJZTEl8gi68Epr56lf/iWJamE0yPlPXT31MzwEIP2XpJyuPHOb1A92YplCp 4RwA== X-Gm-Message-State: ACgBeo39IrcSvIGgoMO4Oz3/udHI81qOVbgxXMW0cSfLWleiPrgeLodz N5posZ5FYBuCr0K8XUP5UjBBUp9R3g== X-Google-Smtp-Source: AA6agR7FTpMgJFFFhEJanQ9OsNJ/kOQCxwc/V8biQsMWsiREPO/EQAx7Q06z8jzX5tkWKR1sDAcACTfQzw== X-Received: from nhuck.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:39cc]) (user=nhuck job=sendgmr) by 2002:a25:c0c1:0:b0:6a9:4913:95a8 with SMTP id c184-20020a25c0c1000000b006a9491395a8mr23166139ybf.168.1663019065938; Mon, 12 Sep 2022 14:44:25 -0700 (PDT) Date: Mon, 12 Sep 2022 14:43:53 -0700 Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220912214357.928947-1-nhuck@google.com> Subject: [PATCH] net: mana: Fix return type of mana_start_xmit From: Nathan Huckleberry Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Dexuan Cui , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" 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 mana_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/microsoft/mana/mana_en.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 9259a74eca40..dfecef8c08e5 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -128,7 +128,7 @@ static int mana_map_skb(struct sk_buff *skb, struct mana_port_context *apc, return -ENOMEM; } -int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) +netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) { enum mana_tx_pkt_format pkt_fmt = MANA_SHORT_PKT_FMT; struct mana_port_context *apc = netdev_priv(ndev); -- 2.37.2.789.g6183377224-goog 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 27D7CC6FA86 for ; Mon, 12 Sep 2022 21:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbiILVoe (ORCPT ); Mon, 12 Sep 2022 17:44:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbiILVob (ORCPT ); Mon, 12 Sep 2022 17:44:31 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CACC2B1 for ; Mon, 12 Sep 2022 14:44:26 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-348608c1cd3so86381227b3.10 for ; Mon, 12 Sep 2022 14:44:26 -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=0Wdj+RXvtzSTWVCBC3E7Qvw8dMmiW0pb/ksTMDuYAvw=; b=Ajm7KGtZDxaAtqs155/MmwWxM6UwHlfv1/ltpg+APIwxnT3r1WoPDzMRNnoIeGMDkw qba7V8fAUK6z4GU96imY+n5v3zq+Hr5EeWufMvmssnHW6fprfNZ2r+cGy4TBm8sTXwQO qndhToQiip1Kl1SPvNUYQ4hZCiZHTXmX3O9JPLYQzdY+ePhKiwI3bDCgI19IivD1bXUg 9WlsJwSPOhsTAJTaqe+uYOqIihE0wjLV6yYLFI7LB7XC36wBe6i7016KvDjl8vb9pvzL R2vnULoJLvkasYdaL+LI+MYrtV3wDegDJeE+xdE6rjWS4uBQyKKJNQgGYJA7A8Ucug5w Qp2w== 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=0Wdj+RXvtzSTWVCBC3E7Qvw8dMmiW0pb/ksTMDuYAvw=; b=VYI9WlFKtT8K47G3iZqHA8TgF5i5iuYZ1XFrz2FGPzs/ZvKkp1O2vNk5eNPu+bJ6Gb JgmPSs7p8nPzLtOPHv0wwaBK4xrwr1550qxOC6uDhTirVOf8uOi1Ym9Wu8COopL8DTl/ 7hNm9AbDRX4CSY2KNOnueyeR1XI/4o9P+HCP3QbrUAqQ9v2f7v4DUy603suiCvXqXanf bX7u01WDXZIfuKyinFJG1Jb7cJaPrzI2D6TJtgRFFRzM6FDXEAwnPmCDzXlLol6gNokq LFFKxE2BkVl2hJIVbFcEvHiK699zJmS+9VzM1JGxuFdqsa49R5MR3+b2WgeNFH1QFf/c A9Xw== X-Gm-Message-State: ACgBeo2hsC89Oxo7ZnOXfc26skzJZrXOkqReX5kj648sV1dlPJmECGzG B4iw6AjqnaqYjmfHntaBBNF6Ia4XOg== X-Google-Smtp-Source: AA6agR7FTpMgJFFFhEJanQ9OsNJ/kOQCxwc/V8biQsMWsiREPO/EQAx7Q06z8jzX5tkWKR1sDAcACTfQzw== X-Received: from nhuck.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:39cc]) (user=nhuck job=sendgmr) by 2002:a25:c0c1:0:b0:6a9:4913:95a8 with SMTP id c184-20020a25c0c1000000b006a9491395a8mr23166139ybf.168.1663019065938; Mon, 12 Sep 2022 14:44:25 -0700 (PDT) Date: Mon, 12 Sep 2022 14:43:53 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220912214357.928947-1-nhuck@google.com> Subject: [PATCH] net: mana: Fix return type of mana_start_xmit From: Nathan Huckleberry Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Dexuan Cui , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Nathan Chancellor , Nick Desaulniers , Tom Rix , linux-hyperv@vger.kernel.org, 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: linux-kernel@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 mana_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/microsoft/mana/mana_en.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 9259a74eca40..dfecef8c08e5 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -128,7 +128,7 @@ static int mana_map_skb(struct sk_buff *skb, struct mana_port_context *apc, return -ENOMEM; } -int mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) +netdev_tx_t mana_start_xmit(struct sk_buff *skb, struct net_device *ndev) { enum mana_tx_pkt_format pkt_fmt = MANA_SHORT_PKT_FMT; struct mana_port_context *apc = netdev_priv(ndev); -- 2.37.2.789.g6183377224-goog