diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-14 14:37:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-14 14:37:02 -0700 |
| commit | 3a1aa533f7f676aad68f8dbbbba10b9502903770 (patch) | |
| tree | 377c9eaadc91a6babf030d15a77641a2f46c8842 /drivers/net | |
| parent | 94f633ea8ade8418634d152ad0931133338226f6 (diff) | |
| parent | e2b1e4b532abdd39bfb7313146153815e370d60c (diff) | |
| download | linux-3a1aa533f7f676aad68f8dbbbba10b9502903770.tar.bz2 | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/usb/etas_es58x/es58x_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/usb/etas_es58x/es58x_core.c b/drivers/net/can/usb/etas_es58x/es58x_core.c index 7222b3b6ca46..57e5f94468e9 100644 --- a/drivers/net/can/usb/etas_es58x/es58x_core.c +++ b/drivers/net/can/usb/etas_es58x/es58x_core.c @@ -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]) |