From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Nathan Huckleberry <nhuck@google.com>,
llvm@lists.linux.dev, Dan Carpenter <error27@gmail.com>,
Nathan Chancellor <nathan@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>,
ndesaulniers@google.com, linux-staging@lists.linux.dev
Subject: [PATCH AUTOSEL 6.0 48/67] staging: octeon: Fix return type of cvm_oct_xmit and cvm_oct_xmit_pow
Date: Wed, 12 Oct 2022 20:15:29 -0400 [thread overview]
Message-ID: <20221013001554.1892206-48-sashal@kernel.org> (raw)
In-Reply-To: <20221013001554.1892206-1-sashal@kernel.org>
From: Nathan Huckleberry <nhuck@google.com>
[ 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 <error27@gmail.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nathan Huckleberry <nhuck@google.com>
Link: https://lore.kernel.org/r/20220914211057.423617-1-nhuck@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 1ad94c5060b5..a36e36701c74 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -125,7 +125,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)
{
union cvmx_pko_command_word0 pko_command;
union cvmx_buf_ptr hw_buffer;
@@ -506,7 +506,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
* @dev: Device info structure
* 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 78936e9b33b0..6c524668f65a 100644
--- a/drivers/staging/octeon/ethernet-tx.h
+++ b/drivers/staging/octeon/ethernet-tx.h
@@ -5,8 +5,8 @@
* Copyright (c) 2003-2007 Cavium Networks
*/
-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
next prev parent reply other threads:[~2022-10-13 0:21 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-13 0:14 [PATCH AUTOSEL 6.0 01/67] staging: r8188eu: do not spam the kernel log Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 02/67] clk: zynqmp: Fix stack-out-of-bounds in strncpy` Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 03/67] media: cx88: Fix a null-ptr-deref bug in buffer_prepare() Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 04/67] media: platform: fix some double free in meson-ge2d and mtk-jpeg and s5p-mfc Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 05/67] clk: zynqmp: pll: rectify rate rounding in zynqmp_pll_round_rate Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 06/67] RDMA/rxe: Delete error messages triggered by incoming Read requests Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 07/67] usb: host: xhci-plat: suspend and resume clocks Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 08/67] usb: host: xhci-plat: suspend/resume clks for brcm Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 09/67] scsi: lpfc: Fix null ndlp ptr dereference in abnormal exit path for GFT_ID Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 10/67] dmaengine: ti: k3-udma: Reset UDMA_CHAN_RT byte counters to prevent overflow Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 11/67] scsi: 3w-9xxx: Avoid disabling device if failing to enable it Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 12/67] nbd: Fix hung when signal interrupts nbd_start_device_ioctl() Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 13/67] iommu/arm-smmu-v3: Make default domain type of HiSilicon PTT device to identity Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 14/67] usb: gadget: uvc: increase worker prio to WQ_HIGHPRI Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 15/67] staging: rtl8712: Fix return type for implementation of ndo_start_xmit Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 16/67] staging: rtl8192e: " Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 17/67] power: supply: adp5061: fix out-of-bounds read in adp5061_get_chg_type() Sasha Levin
2022-10-13 0:14 ` [PATCH AUTOSEL 6.0 18/67] staging: vt6655: fix potential memory leak Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 19/67] blk-throttle: prevent overflow while calculating wait time Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 20/67] clk: microchip: mpfs: add MSS pll's set & round rate Sasha Levin
2022-10-13 5:29 ` Conor Dooley
2022-10-13 17:55 ` Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 21/67] gpiolib: of: do not ignore requested index when applying quirks Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 22/67] gpiolib: of: make Freescale SPI quirk similar to all others Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 23/67] gpiolib: rework quirk handling in of_find_gpio() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 24/67] ata: libahci_platform: Sanity check the DT child nodes number Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 25/67] habanalabs: ignore EEPROM errors during boot Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 26/67] nvmet-auth: clean up with done_kfree Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 27/67] bcache: fix set_at_max_writeback_rate() for multiple attached devices Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 28/67] soundwire: cadence: Don't overwrite msg->buf during write commands Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 29/67] soundwire: intel: fix error handling on dai registration issues Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 30/67] hid: topre: Add driver fixing report descriptor Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 31/67] habanalabs: remove some f/w descriptor validations Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 32/67] HID: roccat: Fix use-after-free in roccat_read() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 33/67] HSI: ssi_protocol: fix potential resource leak in ssip_pn_open() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 34/67] HID: nintendo: check analog user calibration for plausibility Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 35/67] eventfd: guard wake_up in eventfd fs calls as well Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 36/67] md/raid5: Wait for MD_SB_CHANGE_PENDING in raid5d Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 37/67] usb: host: xhci: Fix potential memory leak in xhci_alloc_stream_info() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 38/67] usb: musb: Fix musb_gadget.c rxstate overflow bug Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 39/67] usb: dwc3: core: add gfladj_refclk_lpm_sel quirk Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 40/67] arm64: dts: imx8mp: Add snps,gfladj-refclk-lpm-sel quirk to USB nodes Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 41/67] usb: dwc3: core: Enable GUCTL1 bit 10 for fixing termination error after resume bug Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 42/67] Revert "usb: storage: Add quirk for Samsung Fit flash" Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 43/67] tty: n_gsm: replace use of gsm_read_ea() with gsm_read_ea_val() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 44/67] io_uring: fix CQE reordering Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 45/67] staging: rtl8723bs: fix potential memory leak in rtw_init_drv_sw() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 46/67] staging: rtl8723bs: fix a potential memory leak in rtw_init_cmd_priv() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 47/67] staging: rtl8192u: Fix return type of ieee80211_xmit Sasha Levin
2022-10-13 0:15 ` Sasha Levin [this message]
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 49/67] staging: r8188eu: fix a potential memory leak in rtw_init_cmd_priv() Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 50/67] scsi: tracing: Fix compile error in trace_array calls when TRACING is disabled Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 51/67] ext2: Use kvmalloc() for group descriptor array Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 52/67] nvme: handle effects after freeing the request Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 53/67] nvme: copy firmware_rev on each init Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 54/67] nvmet-tcp: add bounds check on Transfer Tag Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 55/67] usb: idmouse: fix an uninit-value in idmouse_open Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 56/67] block: replace blk_queue_nowait with bdev_nowait Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 57/67] blk-mq: use quiesced elevator switch when reinitializing queues Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 58/67] nvmet: don't look at the request_queue in nvmet_bdev_zone_mgmt_emulate_all Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 59/67] nvmet: don't look at the request_queue in nvmet_bdev_set_limits Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 60/67] hwmon (occ): Retry for checksum failure Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 61/67] fsi: occ: Prevent use after free Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 62/67] fsi: master-ast-cf: Fix missing of_node_put in fsi_master_acf_probe Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 63/67] dmaengine: dw-edma: Remove runtime PM support Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 64/67] sbitmap: fix lockup while swapping Sasha Levin
2022-10-13 1:08 ` Hugh Dickins
2022-10-13 17:54 ` Sasha Levin
2022-10-13 18:40 ` Hugh Dickins
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 65/67] usb: typec: ucsi: Don't warn on probe deferral Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 66/67] clk: bcm2835: Make peripheral PLLC critical Sasha Levin
2022-10-13 0:15 ` [PATCH AUTOSEL 6.0 67/67] clk: bcm2835: Round UART input clock up Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221013001554.1892206-48-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=arnd@arndb.de \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nhuck@google.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome