diff options
| author |   Marc Kleine-Budde <mkl@pengutronix.de> | 2019-10-09 16:03:18 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-11-04 21:47:21 +0100 |
| commit | a2dc3f5e1022a5ede8af9ab89a144f1e69db8636 (patch) | |
| tree | 622797c93b6106ce71a7a1085bc8c04c9be8d205 /drivers/net/can/rx-offload.c | |
| parent | can: rx-offload: can_rx_offload_queue_tail(): fix error handling, avoid skb mem leak (diff) | |
| download | linux-dev-a2dc3f5e1022a5ede8af9ab89a144f1e69db8636.tar.xz linux-dev-a2dc3f5e1022a5ede8af9ab89a144f1e69db8636.zip | |
can: rx-offload: can_rx_offload_offload_one(): do not increase the skb_queue beyond skb_queue_len_max
The skb_queue is a linked list, holding the skb to be processed in the
next NAPI call.
Without this patch, the queue length in can_rx_offload_offload_one() is
limited to skb_queue_len_max + 1. As the skb_queue is a linked list, no
array or other resources are accessed out-of-bound, however this
behaviour is counterintuitive.
This patch limits the rx-offload skb_queue length to skb_queue_len_max.
Fixes: d254586c3453 ("can: rx-offload: Add support for HW fifo based irq offloading")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/rx-offload.c')
| -rw-r--r-- | drivers/net/can/rx-offload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/rx-offload.c b/drivers/net/can/rx-offload.c index d1c863409945..bdc27481b57f 100644 --- a/drivers/net/can/rx-offload.c +++ b/drivers/net/can/rx-offload.c @@ -115,7 +115,7 @@ static struct sk_buff *can_rx_offload_offload_one(struct can_rx_offload *offload int ret; /* If queue is full or skb not available, read to discard mailbox */ - if (likely(skb_queue_len(&offload->skb_queue) <= + if (likely(skb_queue_len(&offload->skb_queue) < offload->skb_queue_len_max)) skb = alloc_can_skb(offload->dev, &cf); |