Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 06:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux-can-next-for-5.13-20210414

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCgAxFiEEK3kIWJt9yTYMP3ehqclaivrt76kFAmB25i8THG1rbEBwZW5n
 dXRyb25peC5kZQAKCRCpyVqK+u3vqY30CAC27BCWO82Gs3H55ygl9aahnQQHGbVu
 /dgZ3YwvpwmKbLSOwE4n9TgnidGfZmyVXWVbA/XKnc4OBjCpwV5Y/VbNWhTdPDjh
 4Z9VzXWDbFeq+jzrJW8KYXfJ0552oxcTr7BkGmdcVDLqG/g0/iPqyECSVGrmc9A5
 770G8RRiJo8hkUFjcQ8NnkiLL+bWnggWNuFeGzo4AwqJjiJAzpHPk3dpr1rS11BP
 xKW/QdMewZyXhlTvdlI/RMNODjehf8TNeuIsWP6zqKnyFpQad05ltuN+Ti2EhJn0
 LHj9W/JB5wYh/Y5iQZq7JYW2aR41j8O+EvLMc4wV34dDsT880TJJGqqy
 =Cmp9
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
David S. Miller 2021-04-14 14:37:02 -07:00
commit 3a1aa533f7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/usb/etas_es58x/es58x_core.c
View File

@ -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])