can: etas_es58x: fix null pointer dereference when handling error frames
authorVincent Mailhol <mailhol.vincent@wanadoo.fr>
Tue, 13 Apr 2021 11:42:42 +0000 (20:42 +0900)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Wed, 14 Apr 2021 07:32:12 +0000 (09:32 +0200)
commite2b1e4b532abdd39bfb7313146153815e370d60c
tree0531e280fdd167da225ad76c5fe7b19881c8db36
parent5871d0c6b8ea805916c3135d0c53b095315bc674
can: etas_es58x: fix null pointer dereference when handling error frames

During the handling of CAN bus errors, a CAN error SKB is allocated
using alloc_can_err_skb(). Even if the allocation of the SKB fails,
the function continues in order to do the stats handling.

All access to the can_frame pointer (cf) should be guarded by an if
statement:
if (cf)

However, the increment of the rx_bytes stats:
netdev->stats.rx_bytes += cf->can_dlc;
dereferences the cf pointer and was not guarded by an if condition
leading to a NULL pointer dereference if the can_err_skb() function
failed.

Replacing the cf->can_dlc by the macro CAN_ERR_DLC (which is the
length of any CAN error frames) solves this NULL pointer dereference.

Fixes: 8537257874e9 ("can: etas_es58x: add core support for ETAS ES58X CAN USB interfaces")
Link: https://lore.kernel.org/r/20210413114242.2760-1-mailhol.vincent@wanadoo.fr
Reported-by: Arunachalam Santhanam <arunachalam.santhanam@in.bosch.com>
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/etas_es58x/es58x_core.c