projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
edd1a7e
)
can: bcm: check the result of can_send() in bcm_can_tx()
author
Ziyang Xuan
<william.xuanziyang@huawei.com>
Thu, 15 Sep 2022 01:55:56 +0000
(09:55 +0800)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Fri, 23 Sep 2022 11:53:10 +0000
(13:53 +0200)
If can_send() fail, it should not update frames_abs counter
in bcm_can_tx(). Add the result check for can_send() in bcm_can_tx().
Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Suggested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Link:
https://lore.kernel.org/all/9851878e74d6d37aee2f1ee76d68361a46f89458.1663206163.git.william.xuanziyang@huawei.com
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/bcm.c
patch
|
blob
|
history
diff --git
a/net/can/bcm.c
b/net/can/bcm.c
index 0a2adb844280b694a398050b250b68d67e267c4a..27706f6ace34a0296392ae66ca5b0ab1fad26e04 100644
(file)
--- a/
net/can/bcm.c
+++ b/
net/can/bcm.c
@@
-274,6
+274,7
@@
static void bcm_can_tx(struct bcm_op *op)
struct sk_buff *skb;
struct net_device *dev;
struct canfd_frame *cf = op->frames + op->cfsiz * op->currframe;
+ int err;
/* no target device? => exit */
if (!op->ifindex)
@@
-298,11
+299,11
@@
static void bcm_can_tx(struct bcm_op *op)
/* send with loopback */
skb->dev = dev;
can_skb_set_owner(skb, op->sk);
- can_send(skb, 1);
+ err = can_send(skb, 1);
+ if (!err)
+ op->frames_abs++;
- /* update statistics */
op->currframe++;
- op->frames_abs++;
/* reached last frame? */
if (op->currframe >= op->nframes)