From: chenridong <chenridong@huawei.com>
To: Daniel Jordan <daniel.m.jordan@oracle.com>,
Chen Ridong <chenridong@huaweicloud.com>
Cc: <steffen.klassert@secunet.com>, <herbert@gondor.apana.org.au>,
<linux-crypto@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<wangweiyang2@huawei.com>
Subject: Re: [PATCH 2/2] padata: fix UAF in padata_reorder
Date: Fri, 6 Dec 2024 11:48:36 +0800 [thread overview]
Message-ID: <2ba08cbe-ce27-4b83-acad-3845421c9bf6@huawei.com> (raw)
In-Reply-To: <nihv732hsimy4lfnzspjur4ndal7n3nngrukvr5fx7emgp2jzl@mjz6q5zsswds>
On 2024/12/6 7:01, Daniel Jordan wrote:
> Hello Ridong,
>
> On Sat, Nov 23, 2024 at 08:05:09AM +0000, Chen Ridong wrote:
>> From: Chen Ridong <chenridong@huawei.com>
>>
>> A bug was found when run ltp test:
> ...snip...
>> This can be explained as bellow:
>>
>> pcrypt_aead_encrypt
>> ...
>> padata_do_parallel
>> refcount_inc(&pd->refcnt); // add refcnt
>> ...
>> padata_do_serial
>> padata_reorder // pd
>> while (1) {
>> padata_find_next(pd, true); // using pd
>> queue_work_on
>> ...
>> padata_serial_worker crypto_del_alg
>> padata_put_pd_cnt // sub refcnt
>> padata_free_shell
>> padata_put_pd(ps->pd);
>> // pd is freed
>> // loop again, but pd is freed
>> // call padata_find_next, UAF
>> }
>
> Thanks for the fix and clear explanation.
>
>> diff --git a/kernel/padata.c b/kernel/padata.c
>> index 5d8e18cdcb25..627014825266 100644
>> --- a/kernel/padata.c
>> +++ b/kernel/padata.c
>> @@ -319,6 +319,7 @@ static void padata_reorder(struct parallel_data *pd)
>> if (!spin_trylock_bh(&pd->lock))
>> return;
>>
>> + padata_get_pd(pd);
>> while (1) {
>> padata = padata_find_next(pd, true);
>>
>> @@ -355,6 +356,7 @@ static void padata_reorder(struct parallel_data *pd)
>> reorder = per_cpu_ptr(pd->reorder_list, pd->cpu);
>> if (!list_empty(&reorder->list) && padata_find_next(pd, false))
>> queue_work(pinst->serial_wq, &pd->reorder_work);
>> + padata_put_pd(pd);
>
> Putting the ref unconditionally here doesn't cover the case where reorder_work
> is queued and accesses the freed pd.
>
> The review of patches 3-5 from this series has a potential solution for
> this that also keeps some of these refcount operations out of the fast
> path:
>
> https://lore.kernel.org/all/20221019083708.27138-1-nstange@suse.de/
>
Thank you for your review.
IIUC, patches 3-5 from this series aim to fix two issue.
1. Avoid UAF for pd(the patch 3).
2. Avoid UAF for ps(the patch 4-5).
What my patch 2 intends to fix is the issue 1.
Let's focus on issue 1.
As shown bellow, if reorder_work is queued, the refcnt must greater than
0, since its serial work have not be finished yet. Do your agree with that?
pcrypt_aead_encrypt/pcrypt_aead_decrypt
padata_do_parallel // refcount_inc(&pd->refcnt);
padata_parallel_worker
padata->parallel(padata);
padata_do_serial(padata);
// pd->reorder_list // enque reorder_list
padata_reorder
- case1:squeue->work
padata_serial_worker // sub refcnt cnt
- case2:pd->reorder_work // reorder->list is not empty
invoke_padata_reorder // this means refcnt > 0
...
padata_serial_worker
I think the patch 3(from Nicolai Stange) can also avoid UAF for pd, but
it's complicated. IIUC, the issue 1 can only occur in the scenario what
I mentioned is my commit message. How I fix issue 1 is by adding and
putting the refcnt in the padata_reorder function, which is simple and
clear.
If understand something uncorrectly, please let me know.
As the issue 2, I have not encountered it, but it exists in theory.
Thanks,
Ridong
next prev parent reply other threads:[~2024-12-06 3:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-23 8:05 [PATCH 0/2] " Chen Ridong
2024-11-23 8:05 ` [PATCH 1/2] padata: add pd get/put refcnt helper Chen Ridong
2024-11-25 13:17 ` kernel test robot
2024-11-26 11:04 ` kernel test robot
2024-11-29 8:00 ` chenridong
2024-12-05 23:03 ` Daniel Jordan
2024-12-06 2:13 ` chenridong
2024-11-23 8:05 ` [PATCH 2/2] padata: fix UAF in padata_reorder Chen Ridong
2024-12-05 23:01 ` Daniel Jordan
2024-12-06 3:48 ` chenridong [this message]
2024-12-10 9:38 ` Chen Ridong
2024-12-10 19:16 ` Daniel Jordan
2024-12-10 19:12 ` Daniel Jordan
2024-12-23 9:00 ` Chen Ridong
2025-01-07 18:43 ` Daniel Jordan
2025-01-09 7:26 ` Chen Ridong
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=2ba08cbe-ce27-4b83-acad-3845421c9bf6@huawei.com \
--to=chenridong@huawei.com \
--cc=chenridong@huaweicloud.com \
--cc=daniel.m.jordan@oracle.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=steffen.klassert@secunet.com \
--cc=wangweiyang2@huawei.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®