From: "Lin Ma" <linma@zju.edu.cn>
To: "Guenter Roeck" <linux@roeck-us.net>
Cc: krzk@kernel.org, davem@davemloft.net, kuba@kernel.org,
pabeni@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, mudongliangabcd@gmail.com
Subject: Re: [PATCH v0] nfc: nci: add flush_workqueue to prevent uaf
Date: Mon, 18 Apr 2022 21:59:10 +0800 (GMT+08:00) [thread overview]
Message-ID: <524c4fb6.6e33.1803cf85ae9.Coremail.linma@zju.edu.cn> (raw)
In-Reply-To: <20220418134133.GA872670@roeck-us.net>
Hello Guenter,
> I have been wondering about this and the same code further below.
> What prevents the command timer from firing after the call to
> flush_workqueue() ?
>
> Thanks,
> Guenter
>
From my understanding, once the flush_workqueue() is executed, the work that queued in
ndev->cmd_wq will be taken the care of.
That is, once the flush_workqueue() is finished, it promises there is no executing or
pending nci_cmd_work() ever.
static void nci_cmd_work(struct work_struct *work)
{
// ...
mod_timer(&ndev->cmd_timer,
jiffies + msecs_to_jiffies(NCI_CMD_TIMEOUT));
// ...
}
The command timer is still able be fired because the mod_timer() here. That is why the
del_timer_sync() is necessary after the flush_workqueue().
One very puzzling part is that you may find out the timer queue the work again
/* NCI command timer function */
static void nci_cmd_timer(struct timer_list *t)
{
// ...
queue_work(ndev->cmd_wq, &ndev->cmd_work);
}
But I found that this is okay because there is no packets in ndev->cmd_q buffers hence
even there is a queued nci_cmd_work(), it simply checks the queue and returns.
That is, the old race picture as below
> Thread-1 Thread-2
> | nci_dev_up()
> | nci_open_device()
> | __nci_request(nci_reset_req)
> | nci_send_cmd
> | queue_work(cmd_work)
> nci_unregister_device() |
> nci_close_device() | ...
> del_timer_sync(cmd_timer)[1] |
> ... | Worker
> nci_free_device() | nci_cmd_work()
> kfree(ndev)[3] | mod_timer(cmd_timer)[2]
is impossible now because the patched flush_workqueue() make the race like below
> Thread-1 Thread-2
> | nci_dev_up()
> | nci_open_device()
> | __nci_request(nci_reset_req)
> | nci_send_cmd
> | queue_work(cmd_work)
> nci_unregister_device() |
> nci_close_device() | ...
> flush_workqueue()[patch] | Worker
> | nci_cmd_work()
> | mod_timer(cmd_timer)[2]
> // work over then return
> del_timer_sync(cmd_timer)[1] |
> | Timer
> | nci_cmd_timer()
> |
> // timer over then return |
> ... |
> nci_free_device() |
> kfree(ndev)[3] |
With above thinkings and the given fact that my POC didn't raise the UAF, I think the
flush_workqueue() + del_timer_sync() combination is okay to hinder this race.
Tell me if there is anything wrong.
Regards
Lin Ma
next prev parent reply other threads:[~2022-04-18 15:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-12 16:04 Lin Ma
2022-04-13 6:57 ` Krzysztof Kozlowski
2022-04-13 13:50 ` patchwork-bot+netdevbpf
2022-04-18 13:41 ` Guenter Roeck
2022-04-18 13:59 ` Lin Ma [this message]
2022-04-23 13:52 ` Guenter Roeck
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=524c4fb6.6e33.1803cf85ae9.Coremail.linma@zju.edu.cn \
--to=linma@zju.edu.cn \
--cc=davem@davemloft.net \
--cc=krzk@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mudongliangabcd@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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
all inboxes | Powered by JetHome®