From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=pass header.oldest-pass=0 smtp.remote-ip=85.215.255.80 ARC-Seal: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=pass; t=1794333681; b=ogb4GJo0dW6JW++40agKY9j7gV0SRFGG7MYQ4VK0Ek7qXpQCoMX9Lv+J9Z2xJXVToxvB Jj0/KA5nM7HhHjLX2ZRozC3YeW8QV+buR6VUJnAzVxLfaOQ4EufK+4fWlgIk5RqgSkdcB ZPMCnf4sPNNH6HgQZ24Gfg/9EqHwkoeCRi43u6kmQtr98R0FFdsMc0Sn4xYMesINXv4v/ 4crcEJcEAyjfJm4WPwGk0+b/PshjzQcfnyn5S8JAVu3Nd/TQl90Yq6/7AWjpfUQUMT1XH Cp6/aVTSTJOYTGznkU8B8zUx3ihAy9CAxcs708bKITZEtOdkhirTOPerdTLorEJ0WpQ== ARC-Message-Signature: i=2; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794333681; h=DMARC-Filter:X-RZG-CLASS-ID:DKIM-Signature:DKIM-Signature:X-RZG-AUTH: Received:From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:Content-Type; bh=TolwdslvFspT5ZBI4Tv2IxO5YD8P+cyETueZBVMq1NA=; b=FN4c/3VTiXmK0o96h/9zmbdhxkG7dEQoZSWTNZKrSOGd4xIe60AMEjeGIjUdHGeNoXmu 6aYHHigQZPGRS2WKG2cN/pgxxYeWjjvQ+i7fnT74ncqz/DeFqp8dcuenr2qiEZbV0cWSH GO3mHmf01vtwFaBg09yioSNFKZdOyZRYsHqCSROZ9NMwHOS/e9ERtr9+15oHdtd5RtfHY TV5toB4soeuIWGYyfWR3uEC6Ly4amQBW+T+Hhlk7j3pNC0/HSUdVGKiUe2J4+Q74RENre u6dxoDtTzMj6pJSXRbgexAhM2ASGfT116ygD1rYlzCwbWtXoTeWae+IF0P0xr72HyhA== ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass header.from=hartkopp.net; spf=fail smtp.mailfrom=hartkopp.net; dkim=pass header.d=hartkopp.net header.i=@hartkopp.net header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=aFqdyi4f; dkim=pass header.d=hartkopp.net header.i=@hartkopp.net header.a=ed25519-sha256 header.s=strato-dkim-0003 header.b=0iHLHh8X; arc=pass header.oldest-pass=0 smtp.remote-ip=85.215.255.80 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D11AD606A321 for ; Tue, 10 Nov 2026 18:01:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org D11AD606A321 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=hartkopp.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=aFqdyi4f; dkim=pass header.d=hartkopp.net header.i=@hartkopp.net header.a=ed25519-sha256 header.s=strato-dkim-0003 header.b=0iHLHh8X ARC-Seal: i=1; a=rsa-sha256; t=1794333659; cv=none; d=strato.com; s=strato-dkim-0002; b=Kx9L2WT/LUAtEOFrzfjTt79G4eSU6aHnyDPm9qItcEH4T0fqMKtwUGmyBpjivDYHi4 1IyxO8bskMFARs+d/k9SfT6hf+Ni7N3fMP1Ow7zFJVVY8HL7jmjh/yStpGnze/zCbuhf Jm0/dWyOxjmjUX0HeFDLilzs2t6waVkH4WOsJP+Y7XfaBmj4/+wcuUbn/tf45RHhMc1u Z6688EdVQcmpv63WqHAzPcJRGu+j6lys4YhpDdOaZw0TWP6ueN9/vqP8c0OyLh6/XwzQ Y+zVkOlUQWlgR6KX1Ug9sD5TwuGze1PaWjGWBKDl/EujkkBd0d5vyjz9v3zTJxnBUSbk r25A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1794333659; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=TolwdslvFspT5ZBI4Tv2IxO5YD8P+cyETueZBVMq1NA=; b=SLOEsiF1N3nJDUsx9J0PgdZkokhBRey1eG1rklbaoiKr4NmsoapeONCNFdr2KCxq+g ewbYZ6yxTNs2m5zCn9iQP87EaCWAT5LwvVLmI1QqVxA/dHPH8hfdbTFY7HL0rOmBhwBq 7BDqNMkruiXu1sGwzdFPUWRfynAfjal8wQm8Nmlpm+tpFNOOpOSlKzyZygQeHBELu/x7 e+HaERM8fdS4L8xYaLYTrx51GZaDVwart5Go85q6qv5rX4eNuVcTnAdt1kAFMQ46YcRI mvM+7s+J+EWJj4gv1OmGZShyWy+6F68W9Q+wBCqmx/wHsw/zcuSOm4055AlhBjIeUYNR ABOg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1794333659; s=strato-dkim-0002; d=hartkopp.net; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=TolwdslvFspT5ZBI4Tv2IxO5YD8P+cyETueZBVMq1NA=; b=aFqdyi4fn+cGk1t0kiJIzEO9qw0Kay89jMJefAIt2WBazVhWm6sNSE6d8JjVIApbYh s9d8VH3dB7fHTgkquEyhafI+JcLUTqKZE+6k0DL7C67/YexJpR3EPOp/0QPaD1zXTNAS SBzc8HdU9eHDlQI+HXb8QreNdxlmq0CYTuh6njuTBH+OdBTZaa0wG2uxdu2eR9/9eSq0 Hna2gByMHRE6d2hNUfCd99mZ/5J95JgV9UO1BkrSqOoz5CjdOFxtkYh7beoIWCjSJ8gW mmaCxXnmpk8nX61trdppP3fi3l+VeKfHFqUs0n/3DJH5sBMkEPPuIGLjse4XZEh+Amri zDiw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1794333659; s=strato-dkim-0003; d=hartkopp.net; h=References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=TolwdslvFspT5ZBI4Tv2IxO5YD8P+cyETueZBVMq1NA=; b=0iHLHh8XKGRAWZG7cbKO2rpv1cG9yc9EUoX69fBgVgXnGCpz0d4j1MGdpzedXHyfkn RAIBABdQfxnZnHeKQRDw== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjH4JKvMdQv2tTUsMrZpkO3Mw3lZ/t54cFxeEQ7s8bDup0Q==" Received: from vivo.lan by smtp.strato.de (RZmta 55.6.3 AUTH) with ESMTPSA id Kfdf2a2AAI0x1cq (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 10 Nov 2026 19:00:59 +0100 (CET) From: Oliver Hartkopp To: stable@vger.kernel.org Cc: Sasha Levin , Marc Kleine-Budde , Oliver Hartkopp Subject: [PATCH 6.6.y] can: replace ARPHRD_CAN type checks with can_get_ml_priv() Date: Tue, 10 Nov 2026 19:00:53 +0100 Message-ID: <20261110180053.791986-1-socketcan@hartkopp.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261109201316-failed-6.6-962947b69589@kernel.org> References: <20261109201316-failed-6.6-962947b69589@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="us-ascii" commit 962947b69589881167054bae5accc8abfd5aa4b6 upstream. Commit 4e096a18867a ("net: introduce CAN specific pointer in the struct net_device") introduced an explicit way to assign the midlayer private pointer (dev->ml_priv) to named users like ML_PRIV_CAN. A valid pointer returned by can_get_ml_priv() therefore identifies a real CAN device. The referenced commit only converted the j1939 and proc code to this check, while the other parts of the CAN subsystem still rely on dev->type == ARPHRD_CAN. The TUNSETLINK ioctl allows a down TUN/TAP device to set its hardware type to ARPHRD_CAN while dev->ml_priv remains NULL. Such a repurposed netdevice passes the ARPHRD_CAN checks. Commit 8aa59e355949 ("can: af_can: fix NULL pointer dereference in can_rx_register()") already made can_rx_register() reject such devices. But can_rx_unregister() still only checks dev->type and dereferences the NULL ml_priv when it walks the receive lists of the device. CAN_ISOTP reaches this path: isotp_bind() ignores the return values of can_rx_register() and binds the socket anyway. When the socket is released or the device is unregistered, isotp_release() and isotp_notify() remove the filters that have never been registered and trigger the NULL pointer dereference in can_rx_unregister(). This only requires owning a TUN/TAP device or CAP_NET_ADMIN in an unprivileged user namespace. Convert the remaining ARPHRD_CAN checks in af_can, bcm, gw, isotp and raw to can_get_ml_priv(). Fixes: 4e096a18867a ("net: introduce CAN specific pointer in the struct net_device") Cc: stable@vger.kernel.org Cc: Oleksij Rempel Signed-off-by: Oliver Hartkopp Link: https://patch.msgid.link/20261027-can-rx-lock-v12-1-eb5afc2d8b9b@hartkopp.net Signed-off-by: Marc Kleine-Budde [ backport to 6.6: This tree has no can_skb_ext, so only the ARPHRD_CAN check is removed from the conditions in can_rcv(), canfd_rcv() and canxl_rcv(). Add the include to raw.c, which upstream got with commit faba5860fcf9 ("can: raw: instantly reject disabled CAN frames"). ] Signed-off-by: Oliver Hartkopp --- net/can/af_can.c | 12 ++++++------ net/can/bcm.c | 7 ++++--- net/can/gw.c | 7 ++++--- net/can/isotp.c | 5 +++-- net/can/raw.c | 5 +++-- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/net/can/af_can.c b/net/can/af_can.c index 69f794e82ca6..d96f76bea4e2 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -224,7 +224,7 @@ int can_send(struct sk_buff *skb, int loop) goto inval_skb; } - if (unlikely(skb->dev->type != ARPHRD_CAN)) { + if (unlikely(!can_get_ml_priv(skb->dev))) { err = -EPERM; goto inval_skb; } @@ -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 && !can_get_ml_priv(dev)) return -ENODEV; if (dev && !net_eq(net, dev_net(dev))) @@ -517,7 +517,7 @@ void can_rx_unregister(struct net *net, struct net_device *dev, canid_t can_id, struct can_rcv_lists_stats *rcv_lists_stats = net->can.rcv_lists_stats; struct can_dev_rcv_lists *dev_rcv_lists; - if (dev && dev->type != ARPHRD_CAN) + if (dev && !can_get_ml_priv(dev)) return; if (dev && !net_eq(net, dev_net(dev))) @@ -683,7 +683,7 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev) static int can_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) { - if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_can_skb(skb))) { + if (unlikely(!can_get_ml_priv(dev) || !can_is_can_skb(skb))) { pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n", dev->type, skb->len); @@ -698,7 +698,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, static int canfd_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) { - if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canfd_skb(skb))) { + if (unlikely(!can_get_ml_priv(dev) || !can_is_canfd_skb(skb))) { pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n", dev->type, skb->len); @@ -713,7 +713,7 @@ static int canfd_rcv(struct sk_buff *skb, struct net_device *dev, static int canxl_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) { - if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canxl_skb(skb))) { + if (unlikely(!can_get_ml_priv(dev) || !can_is_canxl_skb(skb))) { pr_warn_once("PF_CAN: dropped non conform CAN XL skbuff: dev type %d, len %d\n", dev->type, skb->len); diff --git a/net/can/bcm.c b/net/can/bcm.c index fcd923c223f4..bfdaab08c423 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -1668,7 +1669,7 @@ static int bcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) goto out_release; } - if (dev->type != ARPHRD_CAN) { + if (!can_get_ml_priv(dev)) { dev_put(dev); ret = -ENODEV; goto out_release; @@ -1816,7 +1817,7 @@ static int bcm_notifier(struct notifier_block *nb, unsigned long msg, { struct net_device *dev = netdev_notifier_info_to_dev(ptr); - if (dev->type != ARPHRD_CAN) + if (!can_get_ml_priv(dev)) return NOTIFY_DONE; if (msg != NETDEV_UNREGISTER && msg != NETDEV_DOWN) return NOTIFY_DONE; @@ -1972,7 +1973,7 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len, ret = -ENODEV; goto fail; } - if (dev->type != ARPHRD_CAN) { + if (!can_get_ml_priv(dev)) { dev_put(dev); ret = -ENODEV; goto fail; diff --git a/net/can/gw.c b/net/can/gw.c index 676af9a0b659..1fff84d8e4e1 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -603,7 +604,7 @@ static int cgw_notifier(struct notifier_block *nb, struct net_device *dev = netdev_notifier_info_to_dev(ptr); struct net *net = dev_net(dev); - if (dev->type != ARPHRD_CAN) + if (!can_get_ml_priv(dev)) return NOTIFY_DONE; if (msg == NETDEV_UNREGISTER) { @@ -1154,7 +1155,7 @@ static int cgw_create_job(struct sk_buff *skb, struct nlmsghdr *nlh, if (!gwj->src.dev) goto out; - if (gwj->src.dev->type != ARPHRD_CAN) + if (!can_get_ml_priv(gwj->src.dev)) goto out; gwj->dst.dev = __dev_get_by_index(net, gwj->ccgw.dst_idx); @@ -1162,7 +1163,7 @@ static int cgw_create_job(struct sk_buff *skb, struct nlmsghdr *nlh, if (!gwj->dst.dev) goto out; - if (gwj->dst.dev->type != ARPHRD_CAN) + if (!can_get_ml_priv(gwj->dst.dev)) goto out; /* is sending the skb back to the incoming interface intended? */ diff --git a/net/can/isotp.c b/net/can/isotp.c index a11999c50c8a..71ba2b7c9a5c 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -65,6 +65,7 @@ #include #include #include +#include #include #include #include @@ -1589,7 +1590,7 @@ static int isotp_bind(struct socket *sock, struct sockaddr *uaddr, int len) err = -ENODEV; goto out; } - if (dev->type != ARPHRD_CAN) { + if (!can_get_ml_priv(dev)) { err = -ENODEV; goto out_put_dev; } @@ -1889,7 +1890,7 @@ static int isotp_notifier(struct notifier_block *nb, unsigned long msg, { struct net_device *dev = netdev_notifier_info_to_dev(ptr); - if (dev->type != ARPHRD_CAN) + if (!can_get_ml_priv(dev)) return NOTIFY_DONE; if (msg != NETDEV_UNREGISTER && msg != NETDEV_DOWN) return NOTIFY_DONE; diff --git a/net/can/raw.c b/net/can/raw.c index 517f075a0aec..dd3f4f145beb 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include /* for can_is_canxl_dev_mtu() */ #include @@ -318,7 +319,7 @@ static int raw_notifier(struct notifier_block *nb, unsigned long msg, { struct net_device *dev = netdev_notifier_info_to_dev(ptr); - if (dev->type != ARPHRD_CAN) + if (!can_get_ml_priv(dev)) return NOTIFY_DONE; if (msg != NETDEV_UNREGISTER && msg != NETDEV_DOWN) return NOTIFY_DONE; @@ -458,7 +459,7 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len) err = -ENODEV; goto out; } - if (dev->type != ARPHRD_CAN) { + if (!can_get_ml_priv(dev)) { err = -ENODEV; goto out_put_dev; }