Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1dfc3f8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "can: af_can: fix NULL pointer dereference in can_rx_register()" 



This reverts commit afab4655 which is
commit afab4655 upstream.

It is fixing a commit that was reverted from the Android tree due to it
breaking the ABI, so it is not needed here at all.  Revert it now as it
breaks the build.

Fixes: afab4655 ("can: af_can: fix NULL pointer dereference in can_rx_register()")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: If7235003aab6f625cd81e16e2f21497083fec457
parent 17d66a1f

net/can/af_can.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, 


	/* insert new receiver  (dev,canid,mask) -> (func,data) */



	if (dev && (dev->type != ARPHRD_CAN || !can_get_ml_priv(dev)))

	if (dev && dev->type != ARPHRD_CAN)

		return -ENODEV;



	if (dev && !net_eq(net, dev_net(dev)))