Commit 3a1aa533 authored by David S. Miller's avatar David S. Miller

Merge tag 'linux-can-next-for-5.13-20210414' of...

Merge tag 'linux-can-next-for-5.13-20210414' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2021-04-14

this is a pull request of a single patch for net-next/master.

Vincent Mailhol's patch fixes a NULL pointer dereference when handling
error frames in the etas_es58x driver, which has been added in the
previous PR.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 94f633ea e2b1e4b5
......@@ -856,7 +856,7 @@ int es58x_rx_err_msg(struct net_device *netdev, enum es58x_err error,
* consistency.
*/
netdev->stats.rx_packets++;
netdev->stats.rx_bytes += cf->can_dlc;
netdev->stats.rx_bytes += CAN_ERR_DLC;
if (cf) {
if (cf->data[1])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment