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 A663EC6FA82 for ; Mon, 12 Sep 2022 21:45:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230070AbiILVpb (ORCPT ); Mon, 12 Sep 2022 17:45:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbiILVpU (ORCPT ); Mon, 12 Sep 2022 17:45:20 -0400 Received: from mail-ua1-x94a.google.com (mail-ua1-x94a.google.com [IPv6:2607:f8b0:4864:20::94a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CF051CB36 for ; Mon, 12 Sep 2022 14:45:19 -0700 (PDT) Received: by mail-ua1-x94a.google.com with SMTP id n33-20020ab013e4000000b0039f1bede4c9so3041217uae.4 for ; Mon, 12 Sep 2022 14:45:18 -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=/Jj3vAgrEpX1DljkVFCcAOLTZJVyDl94mCsDlbaWTfw=; b=Xj4EIcIg6IC64GjjkVlNjsH5kct6/Y5PMdIvSRIi3mFav1MkwP8CBJBBQrgXLcWwZJ n8t2HweyN3IPZh88c7dXIZa6Ed+XYafUYg2Cu4YchtA1A/2VloWCU/68eTfZTc6P13m9 MLDZKv3Ioa3XjGUz3RJWfA0dLhMLSEgBsgdrHEt+OdjvuBDTacKvup9GBbeV5aiT9KzF fQw3qMBTBXCttDB4/XfNbEsFPZGGOM4gPFH7T7L2JWdQHyy2/DDtWO1e2sCXmXYm+Efw Es6701+y0ZdBfst8o77qb828by0wmrKlEekuK8/s4SkkAboabONEVypQzd3GwFcRkrAY wlBg== 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=/Jj3vAgrEpX1DljkVFCcAOLTZJVyDl94mCsDlbaWTfw=; b=OxkYyazWBzK9Pmwcd7L9JjgBOnDN66eUsbF/O1qcAv4cTt38cfoD2FKqPfsnCiv9nY CxT0dL3NMvsyEeXl4Z1dU1lWCTsX4NCKeRc8YhkX0HL7SJV/RMu7Ef9zhL1pjHLDwns8 wp/hMAnofgbSYj26Hxjb47nBAQsWSayyG+2QeR2XBK7FMmnBrEAIbcD7UqWy90ydx28V EB0Dihb44Yl3ZFhFCxPCBbOq1lSj6NHdPmFzYh2Bu+xb/xS9BHjDrdAuuOEpf4pY+nDb xdOdAGDFUANvBl+oG628tbdm3H4mA440eLloz4gDNahdsiLlRpRPj9LHBASkt9OtfV6w UUnw== X-Gm-Message-State: ACgBeo0OCyKbooDMJnL3iPy6KA1dO1GfRgbgJfynW8KMFs8OpJaOBWQy crQ+pfBzaM9UkzYPD5lyd8P1WfzQQQ== X-Google-Smtp-Source: AA6agR5bYG0ltKebN2EVuVafJrdOszZ3fazLf/V8UlLwcZfm4Mig7uNZ9aE/OA5z598Sg65ynpaau5hKow== X-Received: from nhuck.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:39cc]) (user=nhuck job=sendgmr) by 2002:a67:ac09:0:b0:388:70e9:63a0 with SMTP id v9-20020a67ac09000000b0038870e963a0mr9253277vse.56.1663019118005; Mon, 12 Sep 2022 14:45:18 -0700 (PDT) Date: Mon, 12 Sep 2022 14:45:10 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220912214510.929070-1-nhuck@google.com> Subject: [PATCH] net: wwan: t7xx: Fix return type of t7xx_ccmni_start_xmit From: Nathan Huckleberry Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, Chandrashekar Devegowda , Intel Corporation , Chiranjeevi Rapolu , Liu Haijun , M Chetan Kumar , Ricardo Martinez , Loic Poulain , Sergey Ryazanov , Johannes Berg , "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 t7xx_ccmni_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/wwan/t7xx/t7xx_netdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wwan/t7xx/t7xx_netdev.c b/drivers/net/wwan/t7xx/t7xx_netdev.c index c6b6547f2c6f..f71d3bc3b237 100644 --- a/drivers/net/wwan/t7xx/t7xx_netdev.c +++ b/drivers/net/wwan/t7xx/t7xx_netdev.c @@ -74,7 +74,7 @@ static int t7xx_ccmni_send_packet(struct t7xx_ccmni *ccmni, struct sk_buff *skb, return 0; } -static int t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t t7xx_ccmni_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct t7xx_ccmni *ccmni = wwan_netdev_drvpriv(dev); int skb_len = skb->len; -- 2.37.2.789.g6183377224-goog