From nobody Sat Jun 20 08:24:47 2026 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B04D6301471 for ; Fri, 17 Apr 2026 17:49:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776448185; cv=none; b=TFIbLdjeg8TI1tlXwsYGAFU/tLX9JxZhuAgdSDdZJiP2EgAZPzUUQRCWctNvhz2GP7y1mx8tyxDSIS0896fidtls+afcuvqAKDvbdf+cHj1mBHgyxDPS4jE1Vs0FNgdkGETcG6JvyiPwxZJ+L0A4s2nDCYgE4mrcKcCYutRJQIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776448185; c=relaxed/simple; bh=qxM9bpCmMiF5eDc0K+meOikWZg8RKK5rCaP1HFtecsQ=; h=Message-ID:In-Reply-To:References:From:Date:Subject:To:Cc; b=a4OwolC2tWqALoyshlXhKAjgeMQ36YakRxkPic5Z3WpDMoAElK1GXhGOqYW6OWv0bCPpRkG9HJnI9atWO9aKGnkY7l9WRLc1qfIMVhQJgjIqxkijiX18Q57fxq4bJYS/iEcutfAZZIrFVXYtDqTQ2SBRUdj7P76gxMz3mBaemiA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RGtbU6uU; arc=none smtp.client-ip=209.85.215.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RGtbU6uU" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c6e2355739dso391867a12.2 for ; Fri, 17 Apr 2026 10:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776448172; x=1777052972; darn=vger.kernel.org; h=cc:to:subject:date:from:references:in-reply-to:message-id:from:to :cc:subject:date:message-id:reply-to; bh=I/po+Uq8euEh6kzAO45zsbl+c3h2HuH6D7bjBdGNC0M=; b=RGtbU6uUwgA7fCsN2QSxugINgavDkyaiWngMqgSlKMUbxeke3oSzEC3h7YdB1Q9Jzj hg+NQDF3TSau6TuESYdAw90U+FUtXUO+CMIsR8u3i7RfrsGmIlB2+tfYaefQhGshkLwN OgK3EC53OjdDV+oUSnX6+fLEQNlpGnucUEwKb8INFKl1W8rjOS+xDCpGKevyOjywHnHy K+blXp7cgDmee5Ub8xjMcKPEer2c+B9YCHxYoNKlEaJsbRm2rpz5JtWhWJ1UD1p4DE+j /tnJnGcd5P5XpwD6sa/epg6fOdEX7gBZwd4W3xgefoN+EGHd+jgDPiLvF5K7PQue3OyQ AxIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776448172; x=1777052972; h=cc:to:subject:date:from:references:in-reply-to:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=I/po+Uq8euEh6kzAO45zsbl+c3h2HuH6D7bjBdGNC0M=; b=GyzkneIpkg3tfeFLE14gCB6V6Ws1iiOh7dJwV17876YXvQuiYvv/AKbeKJkhxZ2XNr Q7A/BTWaD9iWPkt2so4IkvZFICFKzBSFxG1AxdPuDqjDoWWgAvQiCwC1mQPXLlD/KITz la+o8O9VgOBXyB5ZxZ8o5OySSaKTRiVEJdOK/5ldndsMNNbb0Bx2XorCXw0RkmOaBd1J XWuyCKZHxxGdHA9vfjrNDbqNIQ2PdPkaaHhu1879TyVbQ8ElnSXX6aJw+yg8ssjMURZo AlJuevmNmolBOVPIDU2rfq5VfTJi4JKJyYOd0uwbKsuZBh7h5/Wz3ZuhjQDJZNOatjtD rbXQ== X-Gm-Message-State: AOJu0Yz/c1oo1tpBfArD37M8p1cxfskL4drUsZ9jNQ1xwIG44CI8Suse 510h90TwMOQGTIjHzL1p2uhQrhUH9jw+hmNuTvp7POOxmyihRupgXHqN X-Gm-Gg: AeBDievyTrxErBGBmyNV+zzUqoFdWTC3JcTZExRzB5+43iPmkOPwP6ISvr363Bo5iiF V0/E7bbClEHG2vvh3SAHOKHM+x1aV4LtqgQJ0P8s36dlaFcfvbkbV0nK14Pu2A5Svt0O6K+Vbcd OyYTKG8rZN5IhOk9Z+JNBCNvcUmUvnMYtc6oHfbKS6vr+YAjN2XjmoVqQxvkX0c54++hS766OCd PjAPFORDprih8FSfUGU70btJKrMQKjHeKpoWIHz4ea7abyKMhN2wApHuUhRX71I5nK5la7AyWoq 6xsKYx/LpZh0kslEb8hJKK9SIfCHY3e3WltnMBE4GbahEqTYbs5j/q9GOesGioOY//lMoj2Fr1l pUQz6o9bhAV2hC/Sn1XnDh7IyrgHWCCCK8YXAAavzSvawjdjIhhs/dOvACZ+VCGzScZr+TWafWe FNiS4Kk28ajaUueHkxYeuwSKpctIdYyCVxSYhWrjAuqEws0i+yWo19EA8yh4jwCi7Sfy5V0I/Al pG4hvFogRFf3Cg3KdqyQlq/ZXY= X-Received: by 2002:a05:6a20:2450:b0:39f:29ab:b364 with SMTP id adf61e73a8af0-3a08d74fbdcmr3973101637.22.1776448171749; Fri, 17 Apr 2026 10:49:31 -0700 (PDT) Received: from Shuvs-MacBook-Air.local ([43.245.86.86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec23b19sm2949913b3a.59.2026.04.17.10.49.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 10:49:31 -0700 (PDT) Message-ID: In-Reply-To: References: From: Shuvam Pandey Date: Fri, 17 Apr 2026 23:34:25 +0545 Subject: [PATCH v2 1/3] mISDN: serialize socket teardown against device unregister To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Simon Horman Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" get_mdevice() returns a referenced struct device, and mISDN sockets keep that reference in _pms(sk)->dev after bind. That means mISDN_unregister_device() cannot tear the device down as if no socket can still reach it. Several teardown paths can otherwise run after delete_stack() has freed the stack, or after the driver has freed the embedding object once mISDN_unregister_device() returns. Close sockets that still point at the device before delete_stack() runs, wait for the final device release before returning from mISDN_unregister_device(), and serialize bind against unregister with the device lock so a new socket cannot attach after unregister has started. While tightening the close path, reset channel state after CLOSE_CHANNEL so later socket release does not try to tear the same B-channel down twice, and make recvmsg/getname tolerate sockets whose device pointer was cleared by unregister. Fixes: b36b654a7e82 ("mISDN: Create /sys/class/mISDN") Cc: stable@vger.kernel.org Assisted-by: Codex:GPT-5.3-Codex Signed-off-by: Shuvam Pandey --- drivers/isdn/mISDN/core.c | 19 ++- drivers/isdn/mISDN/core.h | 1 + drivers/isdn/mISDN/socket.c | 224 +++++++++++++++++++++++++++++++----- include/linux/mISDNif.h | 1 + 4 files changed, 216 insertions(+), 29 deletions(-) diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c index 8ec2d4d4f1352..4e2be8f03119b 100644 --- a/drivers/isdn/mISDN/core.c +++ b/drivers/isdn/mISDN/core.c @@ -26,7 +26,9 @@ static DEFINE_RWLOCK(bp_lock); =20 static void mISDN_dev_release(struct device *dev) { - /* nothing to do: the device is part of its parent's data structure */ + struct mISDNdevice *mdev =3D container_of(dev, struct mISDNdevice, dev); + + complete(&mdev->released); } =20 static ssize_t id_show(struct device *dev, @@ -219,6 +221,7 @@ mISDN_register_device(struct mISDNdevice *dev, return err; dev->id =3D err; =20 + init_completion(&dev->released); device_initialize(&dev->dev); if (name && name[0]) dev_set_name(&dev->dev, "%s", name); @@ -257,12 +260,24 @@ mISDN_unregister_device(struct mISDNdevice *dev) { printk(KERN_DEBUG "mISDN_unregister %s %d\n", dev_name(&dev->dev), dev->id); /* sysfs_remove_link(&dev->dev.kobj, "device"); */ + /* + * Remove the device from sysfs before taking dev->mutex so bind-side + * get_mdevice() users will fail the later device_is_registered() + * recheck after they acquire device_lock(). + */ device_del(&dev->dev); dev_set_drvdata(&dev->dev, NULL); - + device_lock(&dev->dev); + misdn_sock_release_device(dev); test_and_clear_bit(dev->id, (u_long *)&device_ids); delete_stack(dev); + device_unlock(&dev->dev); put_device(&dev->dev); + /* + * Drivers free the enclosing object after unregister returns, so wait + * until the last outstanding device reference is dropped. + */ + wait_for_completion(&dev->released); } EXPORT_SYMBOL(mISDN_unregister_device); =20 diff --git a/drivers/isdn/mISDN/core.h b/drivers/isdn/mISDN/core.h index 5617c06de8e4d..2cd89293bc211 100644 --- a/drivers/isdn/mISDN/core.h +++ b/drivers/isdn/mISDN/core.h @@ -41,6 +41,7 @@ extern int connect_layer1(struct mISDNdevice *, struct mI= SDNchannel *, u_int, struct sockaddr_mISDN *); extern int create_l2entity(struct mISDNdevice *, struct mISDNchannel *, u_int, struct sockaddr_mISDN *); +void misdn_sock_release_device(struct mISDNdevice *dev); =20 extern int create_stack(struct mISDNdevice *); extern int create_teimanager(struct mISDNdevice *); diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 77b900db1cac2..bf3ad0a2a42bc 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -7,6 +7,7 @@ */ =20 #include +#include #include #include #include "core.h" @@ -57,6 +58,97 @@ static void mISDN_sock_unlink(struct mISDN_sock_list *l,= struct sock *sk) write_unlock_bh(&l->lock); } =20 +/* + * Socket teardown driven by unregister takes device_lock(dev) before + * lock_sock(sk). Bind paths take the same order so unregister can close a + * socket without racing a new bind onto the same device. + */ +static struct sock * +misdn_sock_get(struct mISDN_sock_list *l, struct mISDNdevice *dev) +{ + struct sock *sk; + + read_lock_bh(&l->lock); + sk_for_each(sk, &l->head) { + if (READ_ONCE(_pms(sk)->dev) !=3D dev) + continue; + sock_hold(sk); + read_unlock_bh(&l->lock); + return sk; + } + read_unlock_bh(&l->lock); + return NULL; +} + +static void data_sock_reset_channel(struct sock *sk) +{ + _pms(sk)->ch.protocol =3D ISDN_P_NONE; + _pms(sk)->ch.nr =3D 0; + _pms(sk)->ch.addr =3D 0; + _pms(sk)->ch.st =3D NULL; + _pms(sk)->ch.peer =3D NULL; + _pms(sk)->ch.recv =3D NULL; +} + +static void data_sock_close(struct sock *sk) +{ + bool active =3D _pms(sk)->ch.protocol !=3D ISDN_P_NONE; + + sk->sk_state =3D MISDN_CLOSED; + + if (active) + delete_channel(&_pms(sk)->ch); + + data_sock_reset_channel(sk); + + if (_pms(sk)->dev) { + put_device(&_pms(sk)->dev->dev); + _pms(sk)->dev =3D NULL; + } +} + +static void base_sock_close(struct sock *sk) +{ + sk->sk_state =3D MISDN_CLOSED; + + if (_pms(sk)->dev) { + put_device(&_pms(sk)->dev->dev); + _pms(sk)->dev =3D NULL; + } +} + +void +misdn_sock_release_device(struct mISDNdevice *dev) +{ + struct sock *sk; + + if (dev->D.st) { + while ((sk =3D misdn_sock_get(&dev->D.st->l1sock, dev))) { + lock_sock(sk); + if (_pms(sk)->dev =3D=3D dev) + data_sock_close(sk); + release_sock(sk); + sock_put(sk); + } + } + + while ((sk =3D misdn_sock_get(&data_sockets, dev))) { + lock_sock(sk); + if (_pms(sk)->dev =3D=3D dev) + data_sock_close(sk); + release_sock(sk); + sock_put(sk); + } + + while ((sk =3D misdn_sock_get(&base_sockets, dev))) { + lock_sock(sk); + if (_pms(sk)->dev =3D=3D dev) + base_sock_close(sk); + release_sock(sk); + sock_put(sk); + } +} + static int mISDN_send(struct mISDNchannel *ch, struct sk_buff *skb) { @@ -86,6 +178,14 @@ mISDN_ctrl(struct mISDNchannel *ch, u_int cmd, void *ar= g) switch (cmd) { case CLOSE_CHANNEL: msk->sk.sk_state =3D MISDN_CLOSED; + if (msk->ch.protocol >=3D ISDN_P_B_START) { + msk->ch.protocol =3D ISDN_P_NONE; + msk->ch.nr =3D 0; + msk->ch.addr =3D 0; + msk->ch.st =3D NULL; + msk->ch.peer =3D NULL; + msk->ch.recv =3D NULL; + } break; } return 0; @@ -127,18 +227,30 @@ mISDN_sock_recvmsg(struct socket *sock, struct msghdr= *msg, size_t len, =20 if (msg->msg_name) { DECLARE_SOCKADDR(struct sockaddr_mISDN *, maddr, msg->msg_name); + int dev_id, ch_nr, ch_addr; + + lock_sock(sk); + if (!_pms(sk)->dev) { + release_sock(sk); + skb_free_datagram(sk, skb); + return -EBADFD; + } + dev_id =3D _pms(sk)->dev->id; + ch_nr =3D _pms(sk)->ch.nr; + ch_addr =3D _pms(sk)->ch.addr; + release_sock(sk); =20 maddr->family =3D AF_ISDN; - maddr->dev =3D _pms(sk)->dev->id; + maddr->dev =3D dev_id; if ((sk->sk_protocol =3D=3D ISDN_P_LAPD_TE) || (sk->sk_protocol =3D=3D ISDN_P_LAPD_NT)) { maddr->channel =3D (mISDN_HEAD_ID(skb) >> 16) & 0xff; maddr->tei =3D (mISDN_HEAD_ID(skb) >> 8) & 0xff; maddr->sapi =3D mISDN_HEAD_ID(skb) & 0xff; } else { - maddr->channel =3D _pms(sk)->ch.nr; - maddr->sapi =3D _pms(sk)->ch.addr & 0xFF; - maddr->tei =3D (_pms(sk)->ch.addr >> 8) & 0xFF; + maddr->channel =3D ch_nr; + maddr->sapi =3D ch_addr & 0xFF; + maddr->tei =3D (ch_addr >> 8) & 0xFF; } msg->msg_namelen =3D sizeof(*maddr); } @@ -241,16 +353,14 @@ data_sock_release(struct socket *sock) printk(KERN_DEBUG "%s(%p) sk=3D%p\n", __func__, sock, sk); if (!sk) return 0; + + lock_sock(sk); + switch (sk->sk_protocol) { case ISDN_P_TE_S0: case ISDN_P_NT_S0: case ISDN_P_TE_E1: case ISDN_P_NT_E1: - if (sk->sk_state =3D=3D MISDN_BOUND) - delete_channel(&_pms(sk)->ch); - else - mISDN_sock_unlink(&data_sockets, sk); - break; case ISDN_P_LAPD_TE: case ISDN_P_LAPD_NT: case ISDN_P_B_RAW: @@ -259,13 +369,11 @@ data_sock_release(struct socket *sock) case ISDN_P_B_L2DTMF: case ISDN_P_B_L2DSP: case ISDN_P_B_L2DSPHDLC: - delete_channel(&_pms(sk)->ch); + data_sock_close(sk); mISDN_sock_unlink(&data_sockets, sk); break; } =20 - lock_sock(sk); - sock_orphan(sk); skb_queue_purge(&sk->sk_receive_queue); =20 @@ -466,6 +574,7 @@ data_sock_bind(struct socket *sock, struct sockaddr_uns= ized *addr, int addr_len) { struct sockaddr_mISDN *maddr =3D (struct sockaddr_mISDN *) addr; struct sock *sk =3D sock->sk; + struct mISDNdevice *dev, *lockdev; struct sock *csk; int err =3D 0; =20 @@ -477,13 +586,35 @@ data_sock_bind(struct socket *sock, struct sockaddr_u= nsized *addr, int addr_len) return -EINVAL; =20 lock_sock(sk); + if (sk->sk_state =3D=3D MISDN_CLOSED) { + release_sock(sk); + return -EBADFD; + } + if (_pms(sk)->dev) { + release_sock(sk); + return -EALREADY; + } + release_sock(sk); + + dev =3D get_mdevice(maddr->dev); + if (!dev) + return -ENODEV; + + lockdev =3D dev; + device_lock(&dev->dev); + lock_sock(sk); + + if (sk->sk_state =3D=3D MISDN_CLOSED) { + err =3D -EBADFD; + goto done; + } =20 if (_pms(sk)->dev) { err =3D -EALREADY; goto done; } - _pms(sk)->dev =3D get_mdevice(maddr->dev); - if (!_pms(sk)->dev) { + + if (!device_is_registered(&dev->dev)) { err =3D -ENODEV; goto done; } @@ -493,7 +624,7 @@ data_sock_bind(struct socket *sock, struct sockaddr_uns= ized *addr, int addr_len) sk_for_each(csk, &data_sockets.head) { if (sk =3D=3D csk) continue; - if (_pms(csk)->dev !=3D _pms(sk)->dev) + if (READ_ONCE(_pms(csk)->dev) !=3D dev) continue; if (csk->sk_protocol >=3D ISDN_P_B_START) continue; @@ -516,15 +647,15 @@ data_sock_bind(struct socket *sock, struct sockaddr_u= nsized *addr, int addr_len) case ISDN_P_TE_E1: case ISDN_P_NT_E1: mISDN_sock_unlink(&data_sockets, sk); - err =3D connect_layer1(_pms(sk)->dev, &_pms(sk)->ch, - sk->sk_protocol, maddr); + err =3D connect_layer1(dev, &_pms(sk)->ch, sk->sk_protocol, + maddr); if (err) mISDN_sock_link(&data_sockets, sk); break; case ISDN_P_LAPD_TE: case ISDN_P_LAPD_NT: - err =3D create_l2entity(_pms(sk)->dev, &_pms(sk)->ch, - sk->sk_protocol, maddr); + err =3D create_l2entity(dev, &_pms(sk)->ch, sk->sk_protocol, + maddr); break; case ISDN_P_B_RAW: case ISDN_P_B_HDLC: @@ -532,19 +663,26 @@ data_sock_bind(struct socket *sock, struct sockaddr_u= nsized *addr, int addr_len) case ISDN_P_B_L2DTMF: case ISDN_P_B_L2DSP: case ISDN_P_B_L2DSPHDLC: - err =3D connect_Bstack(_pms(sk)->dev, &_pms(sk)->ch, - sk->sk_protocol, maddr); + err =3D connect_Bstack(dev, &_pms(sk)->ch, sk->sk_protocol, + maddr); break; default: err =3D -EPROTONOSUPPORT; } - if (err) + if (err) { + data_sock_reset_channel(sk); goto done; + } + _pms(sk)->dev =3D dev; + dev =3D NULL; sk->sk_state =3D MISDN_BOUND; _pms(sk)->ch.protocol =3D sk->sk_protocol; =20 done: release_sock(sk); + device_unlock(&lockdev->dev); + if (dev) + put_device(&dev->dev); return err; } =20 @@ -555,10 +693,11 @@ data_sock_getname(struct socket *sock, struct sockadd= r *addr, struct sockaddr_mISDN *maddr =3D (struct sockaddr_mISDN *) addr; struct sock *sk =3D sock->sk; =20 - if (!_pms(sk)->dev) - return -EBADFD; - lock_sock(sk); + if (!_pms(sk)->dev) { + release_sock(sk); + return -EBADFD; + } =20 maddr->family =3D AF_ISDN; maddr->dev =3D _pms(sk)->dev->id; @@ -623,6 +762,10 @@ base_sock_release(struct socket *sock) if (!sk) return 0; =20 + lock_sock(sk); + base_sock_close(sk); + release_sock(sk); + mISDN_sock_unlink(&base_sockets, sk); sock_orphan(sk); sock_put(sk); @@ -700,6 +843,7 @@ base_sock_bind(struct socket *sock, struct sockaddr_uns= ized *addr, int addr_len) { struct sockaddr_mISDN *maddr =3D (struct sockaddr_mISDN *) addr; struct sock *sk =3D sock->sk; + struct mISDNdevice *dev, *lockdev; int err =3D 0; =20 if (addr_len < sizeof(struct sockaddr_mISDN)) @@ -709,21 +853,47 @@ base_sock_bind(struct socket *sock, struct sockaddr_u= nsized *addr, int addr_len) return -EINVAL; =20 lock_sock(sk); + if (sk->sk_state =3D=3D MISDN_CLOSED) { + release_sock(sk); + return -EBADFD; + } + if (_pms(sk)->dev) { + release_sock(sk); + return -EALREADY; + } + release_sock(sk); + + dev =3D get_mdevice(maddr->dev); + if (!dev) + return -ENODEV; + + lockdev =3D dev; + device_lock(&dev->dev); + lock_sock(sk); + + if (sk->sk_state =3D=3D MISDN_CLOSED) { + err =3D -EBADFD; + goto done; + } =20 if (_pms(sk)->dev) { err =3D -EALREADY; goto done; } =20 - _pms(sk)->dev =3D get_mdevice(maddr->dev); - if (!_pms(sk)->dev) { + if (!device_is_registered(&dev->dev)) { err =3D -ENODEV; goto done; } + _pms(sk)->dev =3D dev; + dev =3D NULL; sk->sk_state =3D MISDN_BOUND; =20 done: release_sock(sk); + device_unlock(&lockdev->dev); + if (dev) + put_device(&dev->dev); return err; } =20 diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 7aab4a7697369..ce26d70c1ebfb 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -499,6 +499,7 @@ struct mISDNdevice { u_char channelmap[MISDN_CHMAP_SIZE]; struct list_head bchannels; struct mISDNchannel *teimgr; + struct completion released; struct device dev; }; =20 --=20 2.50.1 (Apple Git-155) From nobody Sat Jun 20 08:24:47 2026 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8385E36894D for ; Fri, 17 Apr 2026 17:49:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776448187; cv=none; b=gSfUJzMfxd+82ueSGltp7Rv8/tFraIped0v3n9NAy3jCatRgN6ycp9GSXJTcfC4eqxv+XUeya4dzaoLwWCBC1vuR2ce/BgprwWkEhBRUxDLeMuZGWyXY0qH+Sb8zraxQLIs6g21FAafCgFxH1EQQsGmXQBl8j/6r1uCeVkJzBsE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776448187; c=relaxed/simple; bh=tAdlcRQThT0aO8/5Zua1LK1/+0KDjbglhVfgvGDjUeg=; h=Message-ID:In-Reply-To:References:From:Date:Subject:To:Cc; b=Xc8sFcKGqko93gxBP+Vj4+40DBWE7dAgtph5IXt3ayMSdGSAfR8vL3ONlZ91uxdZkPGPOiKzXjFd7gGUzpVNlO91HwrMRIibjgElgfi42KomTqQM5+keJG16WU0zNpZelr1H5EOw8hG+bprSlnBMOgcKOUGQObw364fHSkgFC6Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZiUcdxqs; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZiUcdxqs" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c795f096fa5so422974a12.3 for ; Fri, 17 Apr 2026 10:49:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776448174; x=1777052974; darn=vger.kernel.org; h=cc:to:subject:date:from:references:in-reply-to:message-id:from:to :cc:subject:date:message-id:reply-to; bh=uwVV6/549C9ObZhSY3TGmlcvB54RDFmpSsT82OUItwc=; b=ZiUcdxqsbvXxo+p3Si0Rjwt8b2q+ZpxqKW9knUZ7Humiy+PwDVNdmzvTCjuR3BPpE7 is3zA8dB5jip+P4u4mJLxnLIQf3lGnGevzdENFtg0tzPDCbYo59bYl15MFnxKC0K3m0D bXkPi0wE4hd6YCESu+HsLyfhHEVL7T9WeKy0Bt5LL1hCtOPscEEk1QFkdZXKspVIwacf UmpJxMQU0hTXeauNoceYAiU8dyWuSurnsvnMmuQ5B7ZNcqjWkuNmJ+7xlsM7Qb4zFuCi l9eNyksRqgz+cmE1ihEglVsOFNzCTd1sD7JWOxNh36FaTca7k0zeoYlE6c+CCifmqVc8 fuhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776448174; x=1777052974; h=cc:to:subject:date:from:references:in-reply-to:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=uwVV6/549C9ObZhSY3TGmlcvB54RDFmpSsT82OUItwc=; b=rkaGzYaOXNVaVj5ji8INgLZWVCKNGMWAD7tifZAq6HzUgCKulkg9sPLP+6zpvmanY3 BiY1/jM30i/G8pxP8Cn0OQbnFSJsvJ7vbufWxQtrSPd8XsEhTaqZgjj1p+nqyDtvs6IA N39D7Wwtigu4uprGMfovqraU3MrnDhnQIA6zjlUJa+lnDhmD+hTyODbV8YeEWWw6l0Rc 8tFUHvADt1LZVVCYgNKBs2uNhnU8exPdjEy9/d8+CnL2P7BNyqCg314FFnXF2wm039w0 mLiHyMDGGRxL9iHiT4rUy2tJahxjujmPjZJCx97GMPnUWWbwRa4asEoBhXnzNLNqGOtc nsRA== X-Gm-Message-State: AOJu0YwvzV4QdPACK3uv7scQ2Ix2s4SgHVSA2K7vMAHnl6DI6QlY6KQd bP/rLwK9/d28qdKCmWyvmq29J4Lg/x39Z+JxViCZUhIm/qLT+vyUKNNF X-Gm-Gg: AeBDieuL3HOns6XgUj7a4imKLOyT0MVPH2cH+dcTn/qyy2kLHSJIeYBuO0ilw21lVlA GYRVB/EWyrBkvjSNNLus7sS/Fm+f+I1ZHrBejDGFzO9wlZx2jKnzDTI4//zUQJ60yX67GhCqrRi jWTc5zrLs3OA/HMVqLWdb8SP0JIaNpscQTwY5nwmWvmSBURRLdQfvg+laC6sDpuQ8shNyinl0+/ z1Vo9OCNVh5LOf27edUeF7+v9PQrdyEt1W69JxXVUnaRWEQjjKNTNCFmoE1waqXFuhqmkJlq/89 Kq03zXvVS7YnDIo4pDhzJEzj2erqKVgxOjyOFGVvjXZEaNqtm+T67jpiz4a0JBmwcv8LTgpSuEu BPoMRwa6I9x2MDEa9GWmctpuO4107mRIT29yNLaHK3ps1tCv6bMVmNwYyvDJRsIVnKRn84kSkKg gwmv1FPdNPez/8HgkRxjbC08tOMmt5GQLt9YWCmWskB5gLtTAOEHHm0plhztb8SCq/V8ipzWAC7 LMFNmGnH89Nn3UhCiVRGS+NNFg= X-Received: by 2002:a05:6a20:3949:b0:394:3001:8b59 with SMTP id adf61e73a8af0-3a08d8fb8bamr4540797637.53.1776448173940; Fri, 17 Apr 2026 10:49:33 -0700 (PDT) Received: from Shuvs-MacBook-Air.local ([43.245.86.86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec23b19sm2949913b3a.59.2026.04.17.10.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 10:49:33 -0700 (PDT) Message-ID: <2325518b6d24b62e50629473e1cee5563f21a15c.1776446840.git.shuvampandey1@gmail.com> In-Reply-To: References: From: Shuvam Pandey Date: Fri, 17 Apr 2026 23:34:25 +0545 Subject: [PATCH v2 2/3] mISDN: socket: drop temporary references from get_mdevice() To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Simon Horman Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" IMGETDEVINFO and IMSETDEVNAME only use get_mdevice() for a temporary lookup, but neither path drops the reference returned by class_find_device(). Drop the temporary reference once the ioctl finishes. Serialize the name read and rename paths with device_lock() while doing so, and reject lookups that raced with unregister after device_del(). Fixes: b36b654a7e82 ("mISDN: Create /sys/class/mISDN") Cc: stable@vger.kernel.org Assisted-by: Codex:GPT-5.3-Codex Signed-off-by: Shuvam Pandey --- drivers/isdn/mISDN/socket.c | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index bf3ad0a2a42bc..42cda5b8bbe16 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -484,6 +484,13 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd,= unsigned long arg) if (dev) { struct mISDN_devinfo di; =20 + device_lock(&dev->dev); + if (!device_is_registered(&dev->dev)) { + device_unlock(&dev->dev); + put_device(&dev->dev); + err =3D -ENODEV; + break; + } memset(&di, 0, sizeof(di)); di.id =3D dev->id; di.Dprotocols =3D dev->Dprotocols; @@ -493,8 +500,10 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd,= unsigned long arg) sizeof(di.channelmap)); di.nrbchan =3D dev->nrbchan; strscpy(di.name, dev_name(&dev->dev), sizeof(di.name)); + device_unlock(&dev->dev); if (copy_to_user((void __user *)arg, &di, sizeof(di))) err =3D -EFAULT; + put_device(&dev->dev); } else err =3D -ENODEV; break; @@ -802,6 +811,13 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd,= unsigned long arg) if (dev) { struct mISDN_devinfo di; =20 + device_lock(&dev->dev); + if (!device_is_registered(&dev->dev)) { + device_unlock(&dev->dev); + put_device(&dev->dev); + err =3D -ENODEV; + break; + } memset(&di, 0, sizeof(di)); di.id =3D dev->id; di.Dprotocols =3D dev->Dprotocols; @@ -811,8 +827,10 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd,= unsigned long arg) sizeof(di.channelmap)); di.nrbchan =3D dev->nrbchan; strscpy(di.name, dev_name(&dev->dev), sizeof(di.name)); + device_unlock(&dev->dev); if (copy_to_user((void __user *)arg, &di, sizeof(di))) err =3D -EFAULT; + put_device(&dev->dev); } else err =3D -ENODEV; break; @@ -826,10 +844,17 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd= , unsigned long arg) } dn.name[sizeof(dn.name) - 1] =3D '\0'; dev =3D get_mdevice(dn.id); - if (dev) - err =3D device_rename(&dev->dev, dn.name); - else + if (dev) { + device_lock(&dev->dev); + if (!device_is_registered(&dev->dev)) + err =3D -ENODEV; + else + err =3D device_rename(&dev->dev, dn.name); + device_unlock(&dev->dev); + put_device(&dev->dev); + } else { err =3D -ENODEV; + } } break; default: --=20 2.50.1 (Apple Git-155) From nobody Sat Jun 20 08:24:47 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E235A383C9C for ; Fri, 17 Apr 2026 17:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776448186; cv=none; b=O/QApTConW/6MDjZBqq8qoFroiyE5LJGMN/qCCFAiu3nbYNQx1InLNNaK4/qYDu4k+pTE40iNeWt8HIqYDPI8lQPKFu6OOwIU+Tt8Uwx52+lndbCCdVW560TAKjYNpQCB9YEL7zm16j4CVi86XIXcuFG4S0DuACmDOyhcwaVcrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776448186; c=relaxed/simple; bh=dxnH0f5C5Vn18aTsHsoy3uUPp2cDYyJJW1cVCZr+sro=; h=Message-ID:In-Reply-To:References:From:Date:Subject:To:Cc; b=Hf47qRLBRjECPAIKKtgJRmTV/VcOe8ztEP3aAMz7NDfl5Ho/wIWTSUIHBCgJ1yrgPk03vuaAliMhj2fo4VnnGHdl/G5MkkqqSR63vY2AsRlhzWYCJlKLZTsbp0z1kptGKA0NKWiA+VNqR5os6L6vf7EvXFGXJybsIEkwWwTkF7g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=sb7gL7dB; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sb7gL7dB" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-82f8893bff3so480541b3a.2 for ; Fri, 17 Apr 2026 10:49:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776448176; x=1777052976; darn=vger.kernel.org; h=cc:to:subject:date:from:references:in-reply-to:message-id:from:to :cc:subject:date:message-id:reply-to; bh=B/7hfAHCRrvVYNg45OT8U1RufNMowjZzViktq3xYVPo=; b=sb7gL7dBJnUW4Xlud/oagSHBKUQLFXZ8OxpAN6mSvVNijq588pQBqpk9r+HodKNSiK P0avMcvzkzGTac4jcDbA+GrHubIuW6KdE7bJmS7S8Ace6Pw6TlZOWEebhIXsT1o39FMw g4K9e9ab8BlbG7h4SyyzIquaOtl/xt32SWYIzgfYXOipCTsS4Bbfg/JareZYpXOUYoKh bKgO9cIlNMaKqbGXgHoIckIWx3Pe6SLxm0eBONVW/MO7intpK9j/gHmmfuvRiGTHFN67 MD6IIlodiF7G2sRCZankcaGfrPnTBJkf1s4DBoIB9pK8pSSIcYQWAeVHI3qZZvrezdg0 4GbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776448176; x=1777052976; h=cc:to:subject:date:from:references:in-reply-to:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=B/7hfAHCRrvVYNg45OT8U1RufNMowjZzViktq3xYVPo=; b=ZK3PynzfdzsZHhkVBfimGmS+NQ6Em1ONDhjKLKxom9JrbDzYVqUYRqWA4iwhu7Tb1r jPohxndTcoTiksJ88tVkj0nlb/dksGrNf7J0A54UK1R8NJeEfpp4To+wUfotz/pNVl72 TxdU6l+0LC9qI8eo9oN2uEdBGOwDvFGuA5VmpIVmYgVcz6oFVfwvNeU0VWKpwiLEliXH yIaL5ETAFHZTLGw5KeqHCq+FdMn0g5PQWcyvWM41VszIqfYqHhH60i/3kMh1r6oUFpIS xiEVuVPBvEyixmZugM7NrcyfdapqHDAlyHjfF4g/yA7UXc/HJHpOQoldqiqcxbBo2fxY 2ngQ== X-Gm-Message-State: AOJu0YzkGItHIUsPXSK+pA3qnSpBWSKckZJzu1X3prjgnzApbJMPE0I2 n2tHewmDBOEyG+GXyzF0+4FcddlexFwqmo1VpUlG1eNCERg1XcgegESC X-Gm-Gg: AeBDiesmvWqvaKYZyRrttJFSX1hUq7cKAPvfDad6n5pLBDnXRG/VeF00zU2KnBZI/dR r1jxaHRq6qyJp0psdUgofVvzBW7m0zCGI3rE55uHaGKeySwd3LApYeQPjyUFSNj5gqKMBSgf426 7hKDAVZQzph0rnbgKrLWQirsXnvX8AGmUlAYEcHv/91bJOkd8H1aGMMfK7SmwT7LK1vTEMZBC/j LKcYMEzGX1w0LazXCif+no7jj1K4skPNnGwkTZrPQeYYh8owG1b2Gpi5A7tMW52uPPVyUd0uKjN xi6SMpkhLOfdQwztbB7vW1y+IWpiOejIIBhVDNLWMtaHquNfHoc5sZdXmIF6e0GXQ7sYTj8Q8Ez rkYR8y12gk/BnK4KhqDkGDIjtYOKWsS/9pSx3m5/UwMYVakO4CP1NJVPyhcxPN6kb/T3No2REve xy10O7ut0vO5ZFqPVrVFM5LoypIFuVDhTgTeBpyr6hvSE5Uh/l0NqkrMHU8e6z9LwzDhQFD1+hL s0AfglSyocqYka6ROidcBR74Ec= X-Received: by 2002:a05:6a00:3028:b0:82f:6640:7229 with SMTP id d2e1a72fcca58-82f8c91c9femr4140755b3a.23.1776448176202; Fri, 17 Apr 2026 10:49:36 -0700 (PDT) Received: from Shuvs-MacBook-Air.local ([43.245.86.86]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec23b19sm2949913b3a.59.2026.04.17.10.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2026 10:49:35 -0700 (PDT) Message-ID: <4216b149341fb2f38449e33bd7a14fa76b87aec9.1776446840.git.shuvampandey1@gmail.com> In-Reply-To: References: From: Shuvam Pandey Date: Fri, 17 Apr 2026 23:34:25 +0545 Subject: [PATCH v2 3/3] mISDN: cache stable device names outside the kobject To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Simon Horman Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" mISDN prints and exports device names from several paths that are not tied to the kobject rename internals. device_rename() replaces the kobject name string, so reading it directly leaves mISDN dependent on that storage remaining stable while those paths run. Keep an mISDN-owned copy of the device name, update it on registration and successful rename, and use that cached name from the socket, sysfs, stack, and debug paths. Assisted-by: Codex:GPT-5.3-Codex Signed-off-by: Shuvam Pandey --- drivers/isdn/mISDN/core.c | 18 +++++++++++++----- drivers/isdn/mISDN/layer1.c | 2 +- drivers/isdn/mISDN/socket.c | 12 ++++++++---- drivers/isdn/mISDN/stack.c | 36 ++++++++++++++++++------------------ drivers/isdn/mISDN/tei.c | 2 +- include/linux/mISDNif.h | 1 + 6 files changed, 42 insertions(+), 29 deletions(-) diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c index 4e2be8f03119b..d89c9e54cb5fa 100644 --- a/drivers/isdn/mISDN/core.c +++ b/drivers/isdn/mISDN/core.c @@ -89,8 +89,15 @@ static DEVICE_ATTR_RO(protocol); static ssize_t name_show(struct device *dev, struct device_attribute *attr, char *buf) { - strcpy(buf, dev_name(dev)); - return strlen(buf); + struct mISDNdevice *mdev =3D dev_to_mISDN(dev); + ssize_t len; + + if (!mdev) + return -ENODEV; + device_lock(dev); + len =3D sysfs_emit(buf, "%s", mdev->name); + device_unlock(dev); + return len; } static DEVICE_ATTR_RO(name); =20 @@ -227,9 +234,10 @@ mISDN_register_device(struct mISDNdevice *dev, dev_set_name(&dev->dev, "%s", name); else dev_set_name(&dev->dev, "mISDN%d", dev->id); + strscpy(dev->name, dev_name(&dev->dev), sizeof(dev->name)); if (debug & DEBUG_CORE) printk(KERN_DEBUG "mISDN_register %s %d\n", - dev_name(&dev->dev), dev->id); + dev->name, dev->id); dev->dev.class =3D &mISDN_class; =20 err =3D create_stack(dev); @@ -258,7 +266,7 @@ void mISDN_unregister_device(struct mISDNdevice *dev) { if (debug & DEBUG_CORE) printk(KERN_DEBUG "mISDN_unregister %s %d\n", - dev_name(&dev->dev), dev->id); + dev->name, dev->id); /* sysfs_remove_link(&dev->dev.kobj, "device"); */ /* * Remove the device from sysfs before taking dev->mutex so bind-side @@ -358,7 +366,7 @@ const char *mISDNDevName4ch(struct mISDNchannel *ch) return msg_no_stack; if (!ch->st->dev) return msg_no_stackdev; - return dev_name(&ch->st->dev->dev); + return ch->st->dev->name; }; EXPORT_SYMBOL(mISDNDevName4ch); =20 diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index 3fbc170acf9ab..c5a2e9119e868 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c @@ -100,7 +100,7 @@ l1m_debug(struct FsmInst *fi, char *fmt, ...) vaf.fmt =3D fmt; vaf.va =3D &va; =20 - printk(KERN_DEBUG "%s: %pV\n", dev_name(&l1->dch->dev.dev), &vaf); + printk(KERN_DEBUG "%s: %pV\n", l1->dch->dev.name, &vaf); =20 va_end(va); } diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 42cda5b8bbe16..bce71ae5eb7d4 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -499,7 +499,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, = unsigned long arg) memcpy(di.channelmap, dev->channelmap, sizeof(di.channelmap)); di.nrbchan =3D dev->nrbchan; - strscpy(di.name, dev_name(&dev->dev), sizeof(di.name)); + strscpy(di.name, dev->name, sizeof(di.name)); device_unlock(&dev->dev); if (copy_to_user((void __user *)arg, &di, sizeof(di))) err =3D -EFAULT; @@ -826,7 +826,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, = unsigned long arg) memcpy(di.channelmap, dev->channelmap, sizeof(di.channelmap)); di.nrbchan =3D dev->nrbchan; - strscpy(di.name, dev_name(&dev->dev), sizeof(di.name)); + strscpy(di.name, dev->name, sizeof(di.name)); device_unlock(&dev->dev); if (copy_to_user((void __user *)arg, &di, sizeof(di))) err =3D -EFAULT; @@ -846,10 +846,14 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd= , unsigned long arg) dev =3D get_mdevice(dn.id); if (dev) { device_lock(&dev->dev); - if (!device_is_registered(&dev->dev)) + if (!device_is_registered(&dev->dev)) { err =3D -ENODEV; - else + } else { err =3D device_rename(&dev->dev, dn.name); + if (!err) + strscpy(dev->name, dev_name(&dev->dev), + sizeof(dev->name)); + } device_unlock(&dev->dev); put_device(&dev->dev); } else { diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c index 4e96684af0aac..9b39ddb4a0944 100644 --- a/drivers/isdn/mISDN/stack.c +++ b/drivers/isdn/mISDN/stack.c @@ -165,7 +165,7 @@ send_msg_to_layer(struct mISDNstack *st, struct sk_buff= *skb) else printk(KERN_WARNING "%s: dev(%s) prim(%x) id(%x) no channel\n", - __func__, dev_name(&st->dev->dev), hh->prim, + __func__, st->dev->name, hh->prim, hh->id); } else if (lm =3D=3D 0x8) { WARN_ON(lm =3D=3D 0x8); @@ -175,12 +175,12 @@ send_msg_to_layer(struct mISDNstack *st, struct sk_bu= ff *skb) else printk(KERN_WARNING "%s: dev(%s) prim(%x) id(%x) no channel\n", - __func__, dev_name(&st->dev->dev), hh->prim, + __func__, st->dev->name, hh->prim, hh->id); } else { /* broadcast not handled yet */ printk(KERN_WARNING "%s: dev(%s) prim %x not delivered\n", - __func__, dev_name(&st->dev->dev), hh->prim); + __func__, st->dev->name, hh->prim); } return -ESRCH; } @@ -202,7 +202,7 @@ mISDNStackd(void *data) sigfillset(¤t->blocked); if (*debug & DEBUG_MSG_THREAD) printk(KERN_DEBUG "mISDNStackd %s started\n", - dev_name(&st->dev->dev)); + st->dev->name); =20 if (st->notify !=3D NULL) { complete(st->notify); @@ -238,7 +238,7 @@ mISDNStackd(void *data) printk(KERN_DEBUG "%s: %s prim(%x) id(%x) " "send call(%d)\n", - __func__, dev_name(&st->dev->dev), + __func__, st->dev->name, mISDN_HEAD_PRIM(skb), mISDN_HEAD_ID(skb), err); dev_kfree_skb(skb); @@ -281,7 +281,7 @@ mISDNStackd(void *data) mISDN_STACK_ACTION_MASK)); if (*debug & DEBUG_MSG_THREAD) printk(KERN_DEBUG "%s: %s wake status %08lx\n", - __func__, dev_name(&st->dev->dev), st->status); + __func__, st->dev->name, st->status); test_and_set_bit(mISDN_STACK_ACTIVE, &st->status); =20 test_and_clear_bit(mISDN_STACK_WAKEUP, &st->status); @@ -296,17 +296,17 @@ mISDNStackd(void *data) #ifdef MISDN_MSG_STATS printk(KERN_DEBUG "mISDNStackd daemon for %s proceed %d " "msg %d sleep %d stopped\n", - dev_name(&st->dev->dev), st->msg_cnt, st->sleep_cnt, + st->dev->name, st->msg_cnt, st->sleep_cnt, st->stopped_cnt); task_cputime(st->thread, &utime, &stime); printk(KERN_DEBUG "mISDNStackd daemon for %s utime(%llu) stime(%llu)\n", - dev_name(&st->dev->dev), utime, stime); + st->dev->name, utime, stime); printk(KERN_DEBUG "mISDNStackd daemon for %s nvcsw(%ld) nivcsw(%ld)\n", - dev_name(&st->dev->dev), st->thread->nvcsw, st->thread->nivcsw); + st->dev->name, st->thread->nvcsw, st->thread->nivcsw); printk(KERN_DEBUG "mISDNStackd daemon for %s killed now\n", - dev_name(&st->dev->dev)); + st->dev->name); #endif test_and_set_bit(mISDN_STACK_KILLED, &st->status); test_and_clear_bit(mISDN_STACK_RUNNING, &st->status); @@ -397,15 +397,15 @@ create_stack(struct mISDNdevice *dev) newst->own.recv =3D mISDN_queue_message; if (*debug & DEBUG_CORE_FUNC) printk(KERN_DEBUG "%s: st(%s)\n", __func__, - dev_name(&newst->dev->dev)); + newst->dev->name); newst->notify =3D &done; newst->thread =3D kthread_run(mISDNStackd, (void *)newst, "mISDN_%s", - dev_name(&newst->dev->dev)); + newst->dev->name); if (IS_ERR(newst->thread)) { err =3D PTR_ERR(newst->thread); printk(KERN_ERR "mISDN:cannot create kernel thread for %s (%d)\n", - dev_name(&newst->dev->dev), err); + newst->dev->name, err); delete_teimanager(dev->teimgr); kfree(newst); } else @@ -424,7 +424,7 @@ connect_layer1(struct mISDNdevice *dev, struct mISDNcha= nnel *ch, =20 if (*debug & DEBUG_CORE_FUNC) printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n", - __func__, dev_name(&dev->dev), protocol, adr->dev, + __func__, dev->name, protocol, adr->dev, adr->channel, adr->sapi, adr->tei); switch (protocol) { case ISDN_P_NT_S0: @@ -461,7 +461,7 @@ connect_Bstack(struct mISDNdevice *dev, struct mISDNcha= nnel *ch, =20 if (*debug & DEBUG_CORE_FUNC) printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n", - __func__, dev_name(&dev->dev), protocol, + __func__, dev->name, protocol, adr->dev, adr->channel, adr->sapi, adr->tei); ch->st =3D dev->D.st; @@ -517,7 +517,7 @@ create_l2entity(struct mISDNdevice *dev, struct mISDNch= annel *ch, =20 if (*debug & DEBUG_CORE_FUNC) printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n", - __func__, dev_name(&dev->dev), protocol, + __func__, dev->name, protocol, adr->dev, adr->channel, adr->sapi, adr->tei); rq.protocol =3D ISDN_P_TE_S0; @@ -570,7 +570,7 @@ delete_channel(struct mISDNchannel *ch) } if (*debug & DEBUG_CORE_FUNC) printk(KERN_DEBUG "%s: st(%s) protocol(%x)\n", __func__, - dev_name(&ch->st->dev->dev), ch->protocol); + ch->st->dev->name, ch->protocol); if (ch->protocol >=3D ISDN_P_B_START) { if (ch->peer) { ch->peer->ctrl(ch->peer, CLOSE_CHANNEL, NULL); @@ -623,7 +623,7 @@ delete_stack(struct mISDNdevice *dev) =20 if (*debug & DEBUG_CORE_FUNC) printk(KERN_DEBUG "%s: st(%s)\n", __func__, - dev_name(&st->dev->dev)); + st->dev->name); if (dev->teimgr) delete_teimanager(dev->teimgr); if (st->thread) { diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index 2bad3083be901..876c1194920ef 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c @@ -990,7 +990,7 @@ create_teimgr(struct manager *mgr, struct channel_req *= crq) =20 if (*debug & DEBUG_L2_TEI) printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n", - __func__, dev_name(&mgr->ch.st->dev->dev), + __func__, mgr->ch.st->dev->name, crq->protocol, crq->adr.dev, crq->adr.channel, crq->adr.sapi, crq->adr.tei); if (crq->adr.tei > GROUP_TEI) diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index ce26d70c1ebfb..79f6d8f218b13 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -497,6 +497,7 @@ struct mISDNdevice { u_int Bprotocols; u_int nrbchan; u_char channelmap[MISDN_CHMAP_SIZE]; + char name[MISDN_MAX_IDLEN]; struct list_head bchannels; struct mISDNchannel *teimgr; struct completion released; --=20 2.50.1 (Apple Git-155)