From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de, Marc Kleine-Budde <mkl@pengutronix.de>,
coverity-bot <keescook+coverity-bot@chromium.org>,
Kees Cook <keescook@chromium.org>,
Torin Cooper-Bennun <torin@maxiluxsystems.com>
Subject: [net-next 2/6] can: m_can: m_can_receive_skb(): add missing error handling to can_rx_offload_queue_sorted() call
Date: Wed, 7 Apr 2021 10:01:14 +0200 [thread overview]
Message-ID: <20210407080118.1916040-3-mkl@pengutronix.de> (raw)
In-Reply-To: <20210407080118.1916040-1-mkl@pengutronix.de>
In commit 1be37d3b0414 ("can: m_can: fix periph RX path: use
rx-offload to ensure skbs are sent from softirq context") the RX path
for peripherals (i.e. SPI based m_can controllers) was converted to
the rx-offload infrastructure. However, the error handling for
can_rx_offload_queue_sorted() was forgotten.
can_rx_offload_queue_sorted() will return with an error if the
internal queue is full.
This patch adds the missing error handling, by increasing the
rx_fifo_errors.
Fixes: 1be37d3b0414 ("can: m_can: fix periph RX path: use rx-offload to ensure skbs are sent from softirq context")
Link: https://lore.kernel.org/r/20210401084515.1455013-1-mkl@pengutronix.de
Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
Addresses-Coverity-ID: 1503583 ("Error handling issues")
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: Torin Cooper-Bennun <torin@maxiluxsystems.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/m_can/m_can.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 890ed826a355..34073cd077e4 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -466,10 +466,17 @@ static void m_can_receive_skb(struct m_can_classdev *cdev,
struct sk_buff *skb,
u32 timestamp)
{
- if (cdev->is_peripheral)
- can_rx_offload_queue_sorted(&cdev->offload, skb, timestamp);
- else
+ if (cdev->is_peripheral) {
+ struct net_device_stats *stats = &cdev->net->stats;
+ int err;
+
+ err = can_rx_offload_queue_sorted(&cdev->offload, skb,
+ timestamp);
+ if (err)
+ stats->rx_fifo_errors++;
+ } else {
netif_receive_skb(skb);
+ }
}
static void m_can_read_fifo(struct net_device *dev, u32 rxfs)
--
2.30.2
next prev parent reply other threads:[~2021-04-07 8:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 8:01 pull-request: can-next 2021-04-07 Marc Kleine-Budde
2021-04-07 8:01 ` [net-next 1/6] can: skb: alloc_can{,fd}_skb(): set "cf" to NULL if skb allocation fails Marc Kleine-Budde
2021-04-07 8:01 ` Marc Kleine-Budde [this message]
2021-04-07 8:01 ` [net-next 3/6] can: c_can: remove unused enum BOSCH_C_CAN_PLATFORM Marc Kleine-Budde
2021-04-07 8:01 ` [net-next 4/6] can: mcp251xfd: add BQL support Marc Kleine-Budde
2021-04-07 8:01 ` [net-next 5/6] can: mcp251xfd: mcp251xfd_regmap_crc_read_one(): Factor out crc check into separate function Marc Kleine-Budde
2021-04-07 8:01 ` [net-next 6/6] can: mcp251xfd: mcp251xfd_regmap_crc_read(): work around broken CRC on TBC register Marc Kleine-Budde
2021-04-21 19:58 ` Drew Fustini
2021-04-22 7:18 ` Marc Kleine-Budde
2021-04-22 16:46 ` Patrick Menschel
2021-05-07 7:25 ` Marc Kleine-Budde
2021-05-07 8:21 ` Patrick Menschel
2021-05-07 8:25 ` Marc Kleine-Budde
2021-05-08 18:36 ` Patrick Menschel
2021-05-09 7:46 ` Patrick Menschel
2021-05-10 7:45 ` Marc Kleine-Budde
2021-05-20 10:29 ` Patrick Menschel
2021-05-10 7:43 ` Marc Kleine-Budde
2021-12-07 16:53 ` Modilaynen, Pavel
2021-12-08 8:54 ` Marc Kleine-Budde
2021-12-09 10:22 ` Thomas.Kopp
2021-12-09 11:17 ` AW: " Sven Schuchmann
2021-12-09 11:27 ` Marc Kleine-Budde
2021-12-09 12:53 ` AW: " Sven Schuchmann
2021-12-13 22:12 ` Modilaynen, Pavel
2021-12-21 22:24 ` Thomas.Kopp
2022-06-21 14:25 ` Marc Kleine-Budde
2022-06-22 8:19 ` Marc Kleine-Budde
2022-06-22 13:47 ` Thomas.Kopp
2022-06-26 19:14 ` Marc Kleine-Budde
2021-05-07 22:36 ` Drew Fustini
2021-05-08 12:30 ` Marc Kleine-Budde
2021-04-07 22:10 ` pull-request: can-next 2021-04-07 patchwork-bot+netdevbpf
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=20210407080118.1916040-3-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=keescook+coverity-bot@chromium.org \
--cc=keescook@chromium.org \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=torin@maxiluxsystems.com \
/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;
as well as URLs for NNTP newsgroup(s).