From b1dfc3f8882188ad1fe7d809a8da798117030210 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 29 Nov 2022 16:44:13 +0000 Subject: [PATCH] Revert "can: af_can: fix NULL pointer dereference in can_rx_register()" This reverts commit afab4655750fcb3fca359bc7d7214e3d634cdf9c which is commit afab4655750fcb3fca359bc7d7214e3d634cdf9c 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: afab4655750f ("can: af_can: fix NULL pointer dereference in can_rx_register()") Signed-off-by: Greg Kroah-Hartman Change-Id: If7235003aab6f625cd81e16e2f21497083fec457 --- net/can/af_can.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/can/af_can.c b/net/can/af_can.c index 1c8660a89c6f..306d3584a441 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -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)))