]> git.baikalelectronics.ru Git - kernel.git/commit
can: af_can: prevent potential access of uninitialized member in can_rcv()
authorAnant Thazhemadam <anant.thazhemadam@gmail.com>
Tue, 3 Nov 2020 21:39:05 +0000 (03:09 +0530)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Sun, 15 Nov 2020 17:17:04 +0000 (18:17 +0100)
commita4d07d808089ad435083a024f01827f5d08d250a
tree60091d3a07e522b81ed5dd62ce67ffcd0e291747
parenta639c57595a099e39d96ad4b8b7dae857ba2dc01
can: af_can: prevent potential access of uninitialized member in can_rcv()

In can_rcv(), cfd->len is uninitialized when skb->len = 0, and this
uninitialized cfd->len is accessed nonetheless by pr_warn_once().

Fix this uninitialized variable access by checking cfd->len's validity
condition (cfd->len > CAN_MAX_DLEN) separately after the skb->len's
condition is checked, and appropriately modify the log messages that
are generated as well.
In case either of the required conditions fail, the skb is freed and
NET_RX_DROP is returned, same as before.

Fixes: d7dfc05e5e7c ("can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once")
Reported-by: syzbot+9bcb0c9409066696d3aa@syzkaller.appspotmail.com
Tested-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
Signed-off-by: Anant Thazhemadam <anant.thazhemadam@gmail.com>
Link: https://lore.kernel.org/r/20201103213906.24219-2-anant.thazhemadam@gmail.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
net/can/af_can.c