projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6144423
)
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
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 11:17:10 +0000
(13:17 +0200)
[ Upstream commit
3fd7bfd28cfd68ae80a2fe92ea1615722cc2ee6e
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/can/bcm.c
patch
|
blob
|
blame
|
history
diff --git
a/net/can/bcm.c
b/net/can/bcm.c
index b3f3b02ffd42dab3d5607c89fd951a2c38565f11..89b955ef75d1d9bbad0d15caf8678005a795954e 100644
(file)
--- a/
net/can/bcm.c
+++ b/
net/can/bcm.c
@@
-286,6
+286,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)
@@
-310,11
+311,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)