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 62D78C6FA82 for ; Mon, 12 Sep 2022 21:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229965AbiILVnz (ORCPT ); Mon, 12 Sep 2022 17:43:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229528AbiILVnw (ORCPT ); Mon, 12 Sep 2022 17:43:52 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B05A04C62C for ; Mon, 12 Sep 2022 14:43:51 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id y5-20020a25bb85000000b006af8f244604so1247627ybg.7 for ; Mon, 12 Sep 2022 14:43:51 -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=2d3fydqfX2g65N3phYlMxqgvPYWylfGPLLgNinkZtt0=; b=ZyLbqVNgTed8/0xWnsk+tR2bOwO5rwirlfTupR72ID3PCTMhFXg/e8BAFLSWElwOIb kSEZWlZpBUDgCmHZ6FNZRaMsPx0f9XWxOS9KfY3ch50Le7A9zCo8OpgZd3aHfrxEZZdZ HNABn/7p+5t0vUxv4hrnNsVv7BjgfBaSxu8BYz7IY9/Ls7QRdUWJpJJsCx/GG0TjY4YL 9osbkn93FTbkUyvA3D5z2WBxpQ6T35P0YiCNDIKnzirRfLvomOplATDlwkKMdVOHjLwb qoNnHtZ9PXj8el2ezt0rGJreHXQMtSRkv10hKARhx9ZHKUd5suGg2tJ06B+b/InWPt+g 5yAQ== 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=2d3fydqfX2g65N3phYlMxqgvPYWylfGPLLgNinkZtt0=; b=uXpDBRkY/W6BBpmx6gnuFEjZH8lQMoOD2ZZC5dU9PJkE+mpGGjMp6DLuc55huTZUFU A9uKMnKM0gukKw/RJ/3JDgULa7vtRcY/jY19jYxayL098bDLtmJSPRWCeohn0zVlPNOV OcA3gauLFU4sKBCd4W0dFlk/CrHgmuLtgv9aQcZ0b+MJuNwzNZFpMaN7D8qzfGipqzMt qnCkjH/HcAVZ4CaBFtZp6ndx+CMWwDEOFd6jHrA+6TCirwjBC8mLN+i2DbkVl4ac8/FU aC9HCrIRl5zQEHWMLutC1kIsk7DM9JH/bD06ocTlSlbF3OdMwwummh+j/r9dLZ1H7gQw 5NQw== X-Gm-Message-State: ACgBeo3l/2ifIPu7aTpDl+ht9gs6dJUXmqWo4z9PatIwohLbTpWHQPFo fqavxkW5sADdm2R9+OpX7S7HT144Tw== X-Google-Smtp-Source: AA6agR6dOUbw4syADaJEIcxCeDzWlSzErY/9EAd+wVdfmpfcPpI7s8I6rNEgQ+gEJZAdtRqd6evKVLkZDw== X-Received: from nhuck.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:39cc]) (user=nhuck job=sendgmr) by 2002:a0d:e946:0:b0:345:696:caaa with SMTP id s67-20020a0de946000000b003450696caaamr23604716ywe.507.1663019030957; Mon, 12 Sep 2022 14:43:50 -0700 (PDT) Date: Mon, 12 Sep 2022 14:43:40 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220912214344.928925-1-nhuck@google.com> Subject: [PATCH] net: korina: Fix return type of korina_send_packet From: Nathan Huckleberry Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , 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: 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 korina_send_packet 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/korina.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index df9a8eefa007..eec6a9ec528b 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c @@ -416,7 +416,8 @@ static void korina_abort_rx(struct net_device *dev) } /* transmit packet */ -static int korina_send_packet(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t korina_send_packet(struct sk_buff *skb, + struct net_device *dev) { struct korina_private *lp = netdev_priv(dev); u32 chain_prev, chain_next; -- 2.37.2.789.g6183377224-goog