Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp4046987rwb; Sun, 9 Oct 2022 16:46:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4jEF7oNt/2wNaPZddUFjOsR0SOCfgQSsUN3HbV/U7S/JE9ooiifkX9/dzuXeht7KTZpy9d X-Received: by 2002:a05:6402:2791:b0:45c:2675:7fe4 with SMTP id b17-20020a056402279100b0045c26757fe4mr1218288ede.409.1665359189387; Sun, 09 Oct 2022 16:46:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665359189; cv=none; d=google.com; s=arc-20160816; b=IcrJpJ9qcJblGxW5o3ZnfqB58WL+KgqFpFb+y03c94nwCs6tBcjH+35Ez6uRYNB7+S nr88zD5vIh4DqQRRc9i1Uo+tpULvqGJU7y6XhbYE13Pt/JfQl3l1nQAv2eKAVWnwDSVT WrtSAhK8deu/GGvIicVhymhaN4plA+p9zGVn4bX/f7MNU8bmnUcv5uTEVvdkOShNe6Y6 2v90OYoIdhSUrvVKXpUONzSQAasfu/xuAPg5w4AsICzf3ryfjgFWggRvRMIfLNHWlZ4u UpSL2F1RxEfsdD3CKlMOu8NrHWJObyny4Uk1/YOCgFxCv/qruwdHWjS5xlLDm4pgUHzB timw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mJdzxpiG8btGKm4y8wibe+jQj+Rex2s24JN0XMFt5ls=; b=Hst2D6i2yoTDYkHmvhPDdFBOjKXMvZ507DDMq0BVysthUc2hXfjzWNRwYEsLk84GMr BcDDiKgR2NdPbjlCKimxhZxh0E97iMjYSZNfBfyeWYXtHSF6W3rbaEac3JQuq4eHltup iM7Fum3tltgTYYGKP5QUTpYER3yUC/QnJeVXsGbdLNwBs0XNaYrFfo0WbRemzOAzATd6 P1pH66KPVlOY6FeYAPJbFWBMlsc25v7Hu3qT06HAgSDS0b2t0unrZX2DU6Q8PuV6vLgF U0EG6N61Gi3MdD77cCRagPntLGOzFxDjx7+e7lRlQX9sj8oODTeW5o2s/kxl+sKeJ1ft yzVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Jew543X4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd11-20020a170907628b00b00780636887fesi10652610ejc.797.2022.10.09.16.46.04; Sun, 09 Oct 2022 16:46:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Jew543X4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231520AbiJIWST (ORCPT + 99 others); Sun, 9 Oct 2022 18:18:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbiJIWR6 (ORCPT ); Sun, 9 Oct 2022 18:17:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96AB427FCB; Sun, 9 Oct 2022 15:15:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9535960CF6; Sun, 9 Oct 2022 22:12:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 284AAC433D7; Sun, 9 Oct 2022 22:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353527; bh=EV1aWa0RnASqulCvNKmsejHYmsYcScF6Ye+v3g617V4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jew543X4ihkNoveEcCja/BcWNsrh+qufqZbcJ79i405WrJ74mYToeFmX/fXSORpjy 7MnTl5FiLucZahuoIWwIHAsMgBNIakW7WqrcxlfsvyIkIMUmm7EPef7rpuxioZP5fy ZwsvdEc9wIEylePMS/FdhfGf4hl7+An3yOx8yG65bQojcXrMZXjPDRjRUcIxROZmRC +8Gssfv4Ahp7QR5b2ghTdqkeuw0cJxe5WvFYtHK+Mkuebh3BePI0dMIaQEwyVmMMTx sqFgVACNvhJkvcVZOcUycYhEYpekvfdPzb0tvSgX6KAxKjNsgBdU8bFnhhuEWJd+8M I+cBGg4cbZcFw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, Sergey Ryazanov , Jakub Kicinski , Sasha Levin , chandrashekar.devegowda@intel.com, linuxwwan@intel.com, loic.poulain@linaro.org, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, nathan@kernel.org, ndesaulniers@google.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.0 51/77] net: wwan: t7xx: Fix return type of t7xx_ccmni_start_xmit Date: Sun, 9 Oct 2022 18:07:28 -0400 Message-Id: <20221009220754.1214186-51-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009220754.1214186-1-sashal@kernel.org> References: <20221009220754.1214186-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nathan Huckleberry [ Upstream commit 73c99e26036529e633a0f2d628ad7ddff6594668 ] 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 Acked-by: Sergey Ryazanov Link: https://lore.kernel.org/r/20220912214510.929070-1-nhuck@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- 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.35.1