From: "Ziyang Xuan (William)" <william.xuanziyang@huawei.com>
To: Leon Romanovsky <leon@kernel.org>
Cc: <dledford@redhat.com>, <jgg@ziepe.ca>, <mbloch@nvidia.com>,
<jinpu.wang@ionos.com>, <lee.jones@linaro.org>,
<linux-rdma@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH rdma-rc] IB/core: fix a UAF for netdev in netdevice_event process
Date: Tue, 26 Oct 2021 11:14:01 +0800 [thread overview]
Message-ID: <07239ae2-8994-20a6-1cba-c3018c9b0117@huawei.com> (raw)
In-Reply-To: <YXaPm6oTI/lk5GoT@unreal>
>>>> diff --git a/drivers/infiniband/core/roce_gid_mgmt.c b/drivers/infiniband/core/roce_gid_mgmt.c
>>>> index 68197e576433..063dbe72b7c2 100644
>>>> --- a/drivers/infiniband/core/roce_gid_mgmt.c
>>>> +++ b/drivers/infiniband/core/roce_gid_mgmt.c
>>>> @@ -621,6 +621,7 @@ static void netdevice_event_work_handler(struct work_struct *_work)
>>>> {
>>>> struct netdev_event_work *work =
>>>> container_of(_work, struct netdev_event_work, work);
>>>> + struct net_device *real_dev;
>>>> unsigned int i;
>>>>
>>>> for (i = 0; i < ARRAY_SIZE(work->cmds) && work->cmds[i].cb; i++) {
>>>> @@ -628,6 +629,12 @@ static void netdevice_event_work_handler(struct work_struct *_work)
>>>> work->cmds[i].filter_ndev,
>>>> work->cmds[i].cb,
>>>> work->cmds[i].ndev);
>>>> + real_dev = rdma_vlan_dev_real_dev(work->cmds[i].ndev);
>>>> + if (real_dev)
>>>> + dev_put(real_dev);
>>>> + real_dev = rdma_vlan_dev_real_dev(work->cmds[i].filter_ndev);
>>>> + if (real_dev)
>>>> + dev_put(real_dev);
>>>> dev_put(work->cmds[i].ndev);
>>>> dev_put(work->cmds[i].filter_ndev);
>>>> }
>>>> @@ -638,9 +645,10 @@ static void netdevice_event_work_handler(struct work_struct *_work)
>>>> static int netdevice_queue_work(struct netdev_event_work_cmd *cmds,
>>>> struct net_device *ndev)
>>>> {
>>>> - unsigned int i;
>>>> struct netdev_event_work *ndev_work =
>>>> kmalloc(sizeof(*ndev_work), GFP_KERNEL);
>>>> + struct net_device *real_dev;
>>>> + unsigned int i;
>>>>
>>>> if (!ndev_work)
>>>> return NOTIFY_DONE;
>>>> @@ -653,6 +661,12 @@ static int netdevice_queue_work(struct netdev_event_work_cmd *cmds,
>>>> ndev_work->cmds[i].filter_ndev = ndev;
>>>> dev_hold(ndev_work->cmds[i].ndev);
>>>> dev_hold(ndev_work->cmds[i].filter_ndev);
>>>> + real_dev = rdma_vlan_dev_real_dev(ndev_work->cmds[i].ndev);
>>>> + if (real_dev)
>>>> + dev_hold(real_dev);
>>>> + real_dev = rdma_vlan_dev_real_dev(ndev_work->cmds[i].filter_ndev);
>>>> + if (real_dev)
>>>> + dev_hold(real_dev);
>>>> }
>>>> INIT_WORK(&ndev_work->work, netdevice_event_work_handler);
>>>
>>> Probably, this is the right change, but I don't know well enough that
>>> part of code. What prevents from "real_dev" to disappear right after
>>> your call to rdma_vlan_dev_real_dev()?
>>>
>>
>> It is known that free the net_device until its dev_refcnt is one. The
>> detail realization see netdev_run_todo().The real_dev's dev_refcnt of
>> a vlan net_device will reach one after unregister_netdevice(&real_dev)
>> and unregister_vlan_dev(&vlan_ndev, ...) but the dev_refcnt of the vlan
>> net_device is bigger than one because netdevice_queue_work() will hold
>> the vlan net_device. So my solution is hold the real_dev too in
>> netdevice_queue_work().
>
> dev_hold(ndev_work->cmds[i].filter_ndev);
> + real_dev = rdma_vlan_dev_real_dev(ndev_work->cmds[i].ndev);
> + if (real_dev)
> <------------ real_dev is released here.
> + dev_hold(real_dev);
At first, I thought the real_dev's dev_refcnt is bigger than one before
NETDEV_UNREGISTER notifier event of the vlan net_device because it calls
dev_put(real_dev) after calling unregister_netdevice_queue(dev, head).
I thought unregister_netdevice_queue() would issue NETDEV_UNREGISTER
notifier event of the vlan net_device, I can hold the real_dev in
NETDEV_UNREGISTER notifier event handler netdevice_queue_work().
But I read unregister_vlan_dev() again, found unregister_netdevice_queue()
in unregister_vlan_dev() just move the vlan net_device to a list to unregister
later. So it is possible the real_dev has been freed when we access in
netdevice_queue_work() although the probability is very small.
So the modification need to improve. For example set vlan->real_dev = NULL
after dev_put(real_dev) in unregister_vlan_dev() proposed by Jason Gunthorpe.
Do you have any other good ideas?
Thank you!
next prev parent reply other threads:[~2021-10-26 3:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-25 3:42 [PATCH rdma-rc] IB/core: fix a UAF for netdev in netdevice_event process Ziyang Xuan
2021-10-25 7:33 ` Leon Romanovsky
2021-10-25 8:37 ` Ziyang Xuan (William)
2021-10-25 11:06 ` Leon Romanovsky
2021-10-26 3:14 ` Ziyang Xuan (William) [this message]
2021-10-26 9:03 ` Leon Romanovsky
2021-10-25 16:39 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=07239ae2-8994-20a6-1cba-c3018c9b0117@huawei.com \
--to=william.xuanziyang@huawei.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=jinpu.wang@ionos.com \
--cc=lee.jones@linaro.org \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mbloch@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).