* [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name()
@ 2013-06-26 7:29 Li Zefan
2013-06-26 7:31 ` [PATCH 2/2] dlci: validate the net device in dlci_del() Li Zefan
2013-06-26 22:46 ` [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name() David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Li Zefan @ 2013-06-26 7:29 UTC (permalink / raw)
To: David Miller; +Cc: LKML, netdev
Otherwise the net device returned can be freed at anytime.
Signed-off-by: Li Zefan <lizefan@huawei.com>
Cc: stable@vger.kernel.org
---
drivers/net/wan/dlci.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 147614e..1f6e053 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -385,20 +385,24 @@ static int dlci_del(struct dlci_add *dlci)
struct net_device *master, *slave;
int err;
+ rtnl_lock();
+
/* validate slave device */
master = __dev_get_by_name(&init_net, dlci->devname);
- if (!master)
- return -ENODEV;
+ if (!master) {
+ err = -ENODEV;
+ goto out;
+ }
if (netif_running(master)) {
- return -EBUSY;
+ err = -EBUSY;
+ goto out;
}
dlp = netdev_priv(master);
slave = dlp->slave;
flp = netdev_priv(slave);
- rtnl_lock();
err = (*flp->deassoc)(slave, master);
if (!err) {
list_del(&dlp->list);
@@ -407,8 +411,8 @@ static int dlci_del(struct dlci_add *dlci)
dev_put(slave);
}
+out:
rtnl_unlock();
-
return err;
}
--
1.8.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] dlci: validate the net device in dlci_del()
2013-06-26 7:29 [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name() Li Zefan
@ 2013-06-26 7:31 ` Li Zefan
2013-06-26 22:46 ` David Miller
2013-06-26 22:46 ` [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name() David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Li Zefan @ 2013-06-26 7:31 UTC (permalink / raw)
To: David Miller; +Cc: LKML, netdev, trinity, Li Jinyue
We triggered an oops while running trinity with 3.4 kernel:
BUG: unable to handle kernel paging request at 0000000100000d07
IP: [<ffffffffa0109738>] dlci_ioctl+0xd8/0x2d4 [dlci]
PGD 640c0d067 PUD 0
Oops: 0000 [#1] PREEMPT SMP
CPU 3
...
Pid: 7302, comm: trinity-child3 Not tainted 3.4.24.09+ 40 Huawei Technologies Co., Ltd. Tecal RH2285 /BC11BTSA
RIP: 0010:[<ffffffffa0109738>] [<ffffffffa0109738>] dlci_ioctl+0xd8/0x2d4 [dlci]
...
Call Trace:
[<ffffffff8137c5c3>] sock_ioctl+0x153/0x280
[<ffffffff81195494>] do_vfs_ioctl+0xa4/0x5e0
[<ffffffff8118354a>] ? fget_light+0x3ea/0x490
[<ffffffff81195a1f>] sys_ioctl+0x4f/0x80
[<ffffffff81478b69>] system_call_fastpath+0x16/0x1b
...
It's because the net device is not a dlci device.
Reported-by: Li Jinyue <lijinyue@huawei.com>
Signed-off-by: Li Zefan <lizefan@huawei.com>
Cc: stable@vger.kernel.org
---
drivers/net/wan/dlci.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c
index 1f6e053..6a8a382 100644
--- a/drivers/net/wan/dlci.c
+++ b/drivers/net/wan/dlci.c
@@ -384,6 +384,7 @@ static int dlci_del(struct dlci_add *dlci)
struct frad_local *flp;
struct net_device *master, *slave;
int err;
+ bool found = false;
rtnl_lock();
@@ -394,6 +395,17 @@ static int dlci_del(struct dlci_add *dlci)
goto out;
}
+ list_for_each_entry(dlp, &dlci_devs, list) {
+ if (dlp->master == master) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ err = -ENODEV;
+ goto out;
+ }
+
if (netif_running(master)) {
err = -EBUSY;
goto out;
--
1.8.0.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] dlci: validate the net device in dlci_del()
2013-06-26 7:31 ` [PATCH 2/2] dlci: validate the net device in dlci_del() Li Zefan
@ 2013-06-26 22:46 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-06-26 22:46 UTC (permalink / raw)
To: lizefan; +Cc: linux-kernel, netdev, trinity, lijinyue
From: Li Zefan <lizefan@huawei.com>
Date: Wed, 26 Jun 2013 15:31:58 +0800
> We triggered an oops while running trinity with 3.4 kernel:
>
> BUG: unable to handle kernel paging request at 0000000100000d07
> IP: [<ffffffffa0109738>] dlci_ioctl+0xd8/0x2d4 [dlci]
> PGD 640c0d067 PUD 0
> Oops: 0000 [#1] PREEMPT SMP
> CPU 3
> ...
> Pid: 7302, comm: trinity-child3 Not tainted 3.4.24.09+ 40 Huawei Technologies Co., Ltd. Tecal RH2285 /BC11BTSA
> RIP: 0010:[<ffffffffa0109738>] [<ffffffffa0109738>] dlci_ioctl+0xd8/0x2d4 [dlci]
> ...
> Call Trace:
> [<ffffffff8137c5c3>] sock_ioctl+0x153/0x280
> [<ffffffff81195494>] do_vfs_ioctl+0xa4/0x5e0
> [<ffffffff8118354a>] ? fget_light+0x3ea/0x490
> [<ffffffff81195a1f>] sys_ioctl+0x4f/0x80
> [<ffffffff81478b69>] system_call_fastpath+0x16/0x1b
> ...
>
> It's because the net device is not a dlci device.
>
> Reported-by: Li Jinyue <lijinyue@huawei.com>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name()
2013-06-26 7:29 [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name() Li Zefan
2013-06-26 7:31 ` [PATCH 2/2] dlci: validate the net device in dlci_del() Li Zefan
@ 2013-06-26 22:46 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-06-26 22:46 UTC (permalink / raw)
To: lizefan; +Cc: linux-kernel, netdev
From: Li Zefan <lizefan@huawei.com>
Date: Wed, 26 Jun 2013 15:29:54 +0800
> Otherwise the net device returned can be freed at anytime.
>
> Signed-off-by: Li Zefan <lizefan@huawei.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-26 22:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-26 7:29 [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name() Li Zefan
2013-06-26 7:31 ` [PATCH 2/2] dlci: validate the net device in dlci_del() Li Zefan
2013-06-26 22:46 ` David Miller
2013-06-26 22:46 ` [PATCH 1/2] dlci: acquire rtnl_lock before calling __dev_get_by_name() David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).