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 6A79BC433FE for ; Sun, 9 Oct 2022 22:42:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232316AbiJIWmF (ORCPT ); Sun, 9 Oct 2022 18:42:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233514AbiJIWkW (ORCPT ); Sun, 9 Oct 2022 18:40:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7DAC3D59C; Sun, 9 Oct 2022 15:21:22 -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 DEF8860C9B; Sun, 9 Oct 2022 22:20:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5774C43145; Sun, 9 Oct 2022 22:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665354044; bh=XARdSeZX6xQ7iNIn6+oYLfRF1bbpI2N8i6uwoZRS0Ao=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NasQZY+40P3eoDcyudUR1WbwDF2FYk8nPI9deZm+dfwID6OpSjiDMmaP0kQSyMml8 0veQ1J0nqZ6PA/yz+BYepMdvXeZe7gHJFw1U8Ai+Fj6LcpbSNH+3gHiQJS4H5tgq20 uTyRgyvAhJGpmZzjBYOfdeZxV+n9C+Jn1Nv1D5s2KVcPOTc51oJ9rUi8YmQpb3QslS NiM7JjJ7BMBXOssHxoIDnacTMUx1xwmYWv7NfKPluVz/hnDP7ejew/P8NFJjegynxe QqqxQnKea+6Ofg4Zuk64ryw51RsQ+Dss/XeyDaAZbUjnF8th/AH0PSmb3Q36092reB uYqb0aa9ASHEg== 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 , m.chetan.kumar@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 5.15 29/46] net: wwan: iosm: Fix return type of ipc_wwan_link_transmit Date: Sun, 9 Oct 2022 18:18:54 -0400 Message-Id: <20221009221912.1217372-29-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009221912.1217372-1-sashal@kernel.org> References: <20221009221912.1217372-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nathan Huckleberry [ Upstream commit 0c9441c430104dcf2cd066aae74dbeefb9f9e1bf ] 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 ipc_wwan_link_transmit 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/20220912214455.929028-1-nhuck@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/wwan/iosm/iosm_ipc_wwan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wwan/iosm/iosm_ipc_wwan.c b/drivers/net/wwan/iosm/iosm_ipc_wwan.c index b571d9cedba4..92fb494c7a91 100644 --- a/drivers/net/wwan/iosm/iosm_ipc_wwan.c +++ b/drivers/net/wwan/iosm/iosm_ipc_wwan.c @@ -102,8 +102,8 @@ static int ipc_wwan_link_stop(struct net_device *netdev) } /* Transmit a packet */ -static int ipc_wwan_link_transmit(struct sk_buff *skb, - struct net_device *netdev) +static netdev_tx_t ipc_wwan_link_transmit(struct sk_buff *skb, + struct net_device *netdev) { struct iosm_netdev_priv *priv = wwan_netdev_drvpriv(netdev); struct iosm_wwan *ipc_wwan = priv->ipc_wwan; -- 2.35.1