From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFAD47B; Thu, 13 Oct 2022 00:27:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D49CC433D7; Thu, 13 Oct 2022 00:27:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665620872; bh=r0aEV8EKb9DOXxHrbeT6RYYICS2SSteDHUwqMVp9ya0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mFu1mn+Ysiv2clQz+QX+BUqL1qeSKLtfdS+lblivoiuAKiY9arCuuvWKEEFjB7F79 z5NzwG2wTSgfTKr6zAzA41CE5qrKNJ7ZZvI8/vZNimObJ70lisoLGpr7vp7Wrkpv/e BhtDGhbc73GsbUehvJW+rLrXdVXhCETacOHjWiLG1EuUuXqCnNemEFUVWM+opRnjTD sjzIHk6D+azC73u7Ya/PWq1hLq3jGGGpUbqOZ72mvjYY+JyYP8T60LP2noGsFm7KtQ FF6YkTTUSRWeBgppYPk5gdT79UQvzz70Gg51R71pUk+dfNIGU1kgPCkADIFZ88oob3 UxdTeQnJlylsA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nathan Huckleberry , llvm@lists.linux.dev, Dan Carpenter , Nathan Chancellor , Arnd Bergmann , Greg Kroah-Hartman , Sasha Levin , ndesaulniers@google.com, linux-staging@lists.linux.dev Subject: [PATCH AUTOSEL 4.14 12/13] staging: octeon: Fix return type of cvm_oct_xmit and cvm_oct_xmit_pow Date: Wed, 12 Oct 2022 20:27:11 -0400 Message-Id: <20221013002716.1895839-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221013002716.1895839-1-sashal@kernel.org> References: <20221013002716.1895839-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Nathan Huckleberry [ Upstream commit b77599043f00fce9253d0f22522c5d5b521555ce ] 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 cvm_oct_xmit and cvm_oct_xmit_pow should be changed from int to netdev_tx_t. Link: https://github.com/ClangBuiltLinux/linux/issues/1703 Cc: llvm@lists.linux.dev Reported-by: Dan Carpenter Reviewed-by: Nathan Chancellor Acked-by: Arnd Bergmann Signed-off-by: Nathan Huckleberry Link: https://lore.kernel.org/r/20220914211057.423617-1-nhuck@google.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/octeon/ethernet-tx.c | 4 ++-- drivers/staging/octeon/ethernet-tx.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 31f35025d19e..19c5c27a3ead 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c @@ -138,7 +138,7 @@ static void cvm_oct_free_tx_skbs(struct net_device *dev) * * Returns Always returns NETDEV_TX_OK */ -int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) { cvmx_pko_command_word0_t pko_command; union cvmx_buf_ptr hw_buffer; @@ -521,7 +521,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) * Returns Always returns zero */ -int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev) { struct octeon_ethernet *priv = netdev_priv(dev); void *packet_buffer; diff --git a/drivers/staging/octeon/ethernet-tx.h b/drivers/staging/octeon/ethernet-tx.h index 84848e4c1664..65faefc87081 100644 --- a/drivers/staging/octeon/ethernet-tx.h +++ b/drivers/staging/octeon/ethernet-tx.h @@ -8,8 +8,8 @@ * published by the Free Software Foundation. */ -int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev); -int cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev); +netdev_tx_t cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev); +netdev_tx_t cvm_oct_xmit_pow(struct sk_buff *skb, struct net_device *dev); int cvm_oct_transmit_qos(struct net_device *dev, void *work_queue_entry, int do_free, int qos); void cvm_oct_tx_initialize(void); -- 2.35.1