From: Jarkko Sakkinen <jarkko@kernel.org>
To: Saubhik Mukherjee <saubhik.mukherjee@gmail.com>
Cc: peterhuewe@gmx.de, jgg@ziepe.ca, linux-integrity@vger.kernel.org,
linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org,
andrianov@ispras.ru
Subject: Re: [PATCH v2] char: tpm: vtpm_proxy: Fix race in init
Date: Fri, 9 Jul 2021 20:37:32 +0300 [thread overview]
Message-ID: <20210709173732.tr6bdiesnqg22xro@kernel.org> (raw)
In-Reply-To: <20210708095259.27915-1-saubhik.mukherjee@gmail.com>
On Thu, Jul 08, 2021 at 03:22:59PM +0530, Saubhik Mukherjee wrote:
> vtpm_module_init calls vtpmx_init which calls misc_register. The file
> operations callbacks are registered. So, vtpmx_fops_ioctl can execute in
> parallel with rest of vtpm_module_init. vtpmx_fops_ioctl calls
> vtpmx_ioc_new_dev, which calls vtpm_proxy_create_device, which calls
> vtpm_proxy_work_start, which could read uninitialized workqueue.
>
> To avoid this, create workqueue before vtpmx init.
>
> Found by Linux Driver Verification project (linuxtesting.org).
>
> Fixes: 6f99612e2500 ("tpm: Proxy driver for supporting multiple emulated TPMs")
> Signed-off-by: Saubhik Mukherjee <saubhik.mukherjee@gmail.com>
> ---
>
> Changes since v1 ([0]):
> - Add Fixes tag to commit message, as requested by Jarkko in [1].
>
> [0]: https://lkml.org/lkml/2021/6/23/572
> [1]: https://lkml.org/lkml/2021/6/29/695
>
> drivers/char/tpm/tpm_vtpm_proxy.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
> index 91c772e38bb5..225dfa026a8f 100644
> --- a/drivers/char/tpm/tpm_vtpm_proxy.c
> +++ b/drivers/char/tpm/tpm_vtpm_proxy.c
> @@ -697,23 +697,22 @@ static int __init vtpm_module_init(void)
> {
> int rc;
>
> - rc = vtpmx_init();
> - if (rc) {
> - pr_err("couldn't create vtpmx device\n");
> - return rc;
> - }
> -
> workqueue = create_workqueue("tpm-vtpm");
> if (!workqueue) {
> pr_err("couldn't create workqueue\n");
> - rc = -ENOMEM;
> - goto err_vtpmx_cleanup;
> + return -ENOMEM;
> + }
> +
> + rc = vtpmx_init();
> + if (rc) {
> + pr_err("couldn't create vtpmx device\n");
> + goto err_destroy_workqueue;
> }
>
> return 0;
>
> -err_vtpmx_cleanup:
> - vtpmx_cleanup();
> +err_destroy_workqueue:
> + destroy_workqueue(workqueue);
>
> return rc;
> }
> --
> 2.30.2
>
>
Thanks, I applied this.
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
/Jarkko
next prev parent reply other threads:[~2021-07-09 17:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 9:52 [PATCH v2] char: tpm: vtpm_proxy: Fix race in init Saubhik Mukherjee
2021-07-09 17:37 ` Jarkko Sakkinen [this message]
2021-07-09 18:18 ` Stefan Berger
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=20210709173732.tr6bdiesnqg22xro@kernel.org \
--to=jarkko@kernel.org \
--cc=andrianov@ispras.ru \
--cc=jgg@ziepe.ca \
--cc=ldv-project@linuxtesting.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=saubhik.mukherjee@gmail.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).