From: Florian Westphal <fw@strlen.de>
To: Dong Chenchen <dongchenchen2@huawei.com>
Cc: steffen.klassert@secunet.com, herbert@gondor.apana.org.au,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, fw@strlen.de, timo.teras@iki.fi,
yuehaibing@huawei.com, weiyongjun1@huawei.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net] net: xfrm: skip policies marked as dead while reinserting policies
Date: Mon, 14 Aug 2023 13:30:34 +0200 [thread overview]
Message-ID: <20230814113034.GB7324@breakpoint.cc> (raw)
In-Reply-To: <20230814013352.2771452-1-dongchenchen2@huawei.com>
Dong Chenchen <dongchenchen2@huawei.com> wrote:
> BUG: KASAN: slab-use-after-free in xfrm_policy_inexact_list_reinsert+0xb6/0x430
> Read of size 1 at addr ffff8881051f3bf8 by task ip/668
>
> CPU: 2 PID: 668 Comm: ip Not tainted 6.5.0-rc5-00182-g25aa0bebba72-dirty #64
> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13 04/01/2014
> Call Trace:
> <TASK>
> dump_stack_lvl+0x72/0xa0
> print_report+0xd0/0x620
> kasan_report+0xb6/0xf0
> xfrm_policy_inexact_list_reinsert+0xb6/0x430
> xfrm_policy_inexact_insert_node.constprop.0+0x537/0x800
> xfrm_policy_inexact_alloc_chain+0x23f/0x320
> xfrm_policy_inexact_insert+0x6b/0x590
> xfrm_policy_insert+0x3b1/0x480
> xfrm_add_policy+0x23c/0x3c0
> xfrm_user_rcv_msg+0x2d0/0x510
> netlink_rcv_skb+0x10d/0x2d0
> xfrm_netlink_rcv+0x49/0x60
> netlink_unicast+0x3fe/0x540
> netlink_sendmsg+0x528/0x970
> sock_sendmsg+0x14a/0x160
> ____sys_sendmsg+0x4fc/0x580
> ___sys_sendmsg+0xef/0x160
> __sys_sendmsg+0xf7/0x1b0
> do_syscall_64+0x3f/0x90
> entry_SYSCALL_64_after_hwframe+0x73/0xdd
>
> The root cause is:
>
> cpu 0 cpu1
> xfrm_dump_policy
> xfrm_policy_walk
> list_move_tail
> xfrm_add_policy
> ... ...
> xfrm_policy_inexact_list_reinsert
> list_for_each_entry_reverse
> if (!policy->bydst_reinsert)
> //read non-existent policy
> xfrm_dump_policy_done
> xfrm_policy_walk_done
> list_del(&walk->walk.all);
>
> If dump_one_policy() returns err (triggered by netlink socket),
> xfrm_policy_walk() will move walk initialized by socket to list
> net->xfrm.policy_all. so this socket becomes visible in the global
> policy list. The head *walk can be traversed when users add policies
> with different prefixlen and trigger xfrm_policy node merge.
>
> It can be fixed by skip such "policies" with walk.dead set to 1.
>
> Fixes: 9cf545ebd591 ("xfrm: policy: store inexact policies in a tree ordered by destination address")
> Fixes: 12a169e7d8f4 ("ipsec: Put dumpers on the dump list")
> Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
> ---
> net/xfrm/xfrm_policy.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
> index d6b405782b63..5b56faad78e0 100644
> --- a/net/xfrm/xfrm_policy.c
> +++ b/net/xfrm/xfrm_policy.c
> @@ -848,6 +848,9 @@ static void xfrm_policy_inexact_list_reinsert(struct net *net,
> matched_d = 0;
>
> list_for_each_entry_reverse(policy, &net->xfrm.policy_all, walk.all) {
> + if (policy->walk.dead)
> + continue;
> +
Looks like we have other places that might trigger a splat, e.g.:
1816 int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
..
1827 again:
1828 list_for_each_entry(pol, &net->xfrm.policy_all, walk.all) {
1829 dir = xfrm_policy_id2dir(pol->index);
1830 if (pol->walk.dead ||
1831 dir >= XFRM_POLICY_MAX ||
'walker' has no pol->index, so I suspect this would trigger a kasan splat as well,
this needs to check walk.dead before access to pol->index.
WARNING: multiple messages have this Message-ID (diff)
From: Dong Chenchen <dongchenchen2@huawei.com>
To: <fw@strlen.de>
Cc: <leon@kernel.org>, <steffen.klassert@secunet.com>,
<herbert@gondor.apana.org.au>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<timo.teras@iki.fi>, <yuehaibing@huawei.com>,
<weiyongjun1@huawei.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH net] net: xfrm: skip policies marked as dead while reinserting policies
Date: Mon, 14 Aug 2023 20:58:25 +0800 [thread overview]
Message-ID: <20230814113034.GB7324@breakpoint.cc> (raw)
Message-ID: <20230814125825.p47RZzQ5ngG62EuqZNnCW0Oc7QYKUzYQAQTi5_9mm0k@z> (raw)
In-Reply-To: <20230814013352.2771452-1-dongchenchen2@huawei.com>
Dong Chenchen <dongchenchen2@huawei.com> wrote:
>> BUG: KASAN: slab-use-after-free in xfrm_policy_inexact_list_reinsert+0xb6/0x430
>> Read of size 1 at addr ffff8881051f3bf8 by task ip/668
>>
>> CPU: 2 PID: 668 Comm: ip Not tainted 6.5.0-rc5-00182-g25aa0bebba72-dirty #64
>> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.13 04/01/2014
>> Call Trace:
>> <TASK>
>> dump_stack_lvl+0x72/0xa0
>> print_report+0xd0/0x620
>> kasan_report+0xb6/0xf0
>> xfrm_policy_inexact_list_reinsert+0xb6/0x430
>> xfrm_policy_inexact_insert_node.constprop.0+0x537/0x800
>> xfrm_policy_inexact_alloc_chain+0x23f/0x320
>> xfrm_policy_inexact_insert+0x6b/0x590
>> xfrm_policy_insert+0x3b1/0x480
>> xfrm_add_policy+0x23c/0x3c0
>> xfrm_user_rcv_msg+0x2d0/0x510
>> netlink_rcv_skb+0x10d/0x2d0
>> xfrm_netlink_rcv+0x49/0x60
>> netlink_unicast+0x3fe/0x540
>> netlink_sendmsg+0x528/0x970
>> sock_sendmsg+0x14a/0x160
>> ____sys_sendmsg+0x4fc/0x580
>> ___sys_sendmsg+0xef/0x160
>> __sys_sendmsg+0xf7/0x1b0
>> do_syscall_64+0x3f/0x90
>> entry_SYSCALL_64_after_hwframe+0x73/0xdd
>>
>> The root cause is:
>>
>> cpu 0 cpu1
>> xfrm_dump_policy
>> xfrm_policy_walk
>> list_move_tail
>> xfrm_add_policy
>> ... ...
>> xfrm_policy_inexact_list_reinsert
>> list_for_each_entry_reverse
>> if (!policy->bydst_reinsert)
>> //read non-existent policy
>> xfrm_dump_policy_done
>> xfrm_policy_walk_done
>> list_del(&walk->walk.all);
>>
>> If dump_one_policy() returns err (triggered by netlink socket),
>> xfrm_policy_walk() will move walk initialized by socket to list
>> net->xfrm.policy_all. so this socket becomes visible in the global
>> policy list. The head *walk can be traversed when users add policies
>> with different prefixlen and trigger xfrm_policy node merge.
>>
>> It can be fixed by skip such "policies" with walk.dead set to 1.
>>
>> Fixes: 9cf545ebd591 ("xfrm: policy: store inexact policies in a tree ordered by destination address")
>> Fixes: 12a169e7d8f4 ("ipsec: Put dumpers on the dump list")
>> Signed-off-by: Dong Chenchen <dongchenchen2@huawei.com>
>> ---
>> net/xfrm/xfrm_policy.c | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
>> index d6b405782b63..5b56faad78e0 100644
>> --- a/net/xfrm/xfrm_policy.c
>> +++ b/net/xfrm/xfrm_policy.c
>> @@ -848,6 +848,9 @@ static void xfrm_policy_inexact_list_reinsert(struct net *net,
>> matched_d = 0;
>>
>> list_for_each_entry_reverse(policy, &net->xfrm.policy_all, walk.all) {
>> + if (policy->walk.dead)
>> + continue;
>> +
>
>Looks like we have other places that might trigger a splat, e.g.:
>
>1816 int xfrm_policy_flush(struct net *net, u8 type, bool task_valid)
>..
>1827 again:
>1828 list_for_each_entry(pol, &net->xfrm.policy_all, walk.all) {
>1829 dir = xfrm_policy_id2dir(pol->index);
>1830 if (pol->walk.dead ||
>1831 dir >= XFRM_POLICY_MAX ||
>
>'walker' has no pol->index, so I suspect this would trigger a kasan splat as well,
>this needs to check walk.dead before access to pol->index.
Yes, you are right. xfrm_hash_rebuild(),xfrm_dev_policy_flush() might also trigger
similar bug. xfrm_policy_walk() add "walker" to list tail and these func use
list_for_each_entry() to traverse list.So it is unlikely to trigger the bug.
But there's still possible, i will fix it in v2.
Thanks!
next prev parent reply other threads:[~2023-08-14 11:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-14 1:33 [PATCH net] net: xfrm: skip policies marked as dead while reinserting policies Dong Chenchen
2023-08-14 7:03 ` Leon Romanovsky
2023-08-14 8:58 ` Dong Chenchen
2023-08-14 10:10 ` Leon Romanovsky
2023-08-14 10:10 ` Leon Romanovsky
2023-08-14 11:30 ` Florian Westphal [this message]
2023-08-14 12:58 ` Dong Chenchen
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=20230814113034.GB7324@breakpoint.cc \
--to=fw@strlen.de \
--cc=davem@davemloft.net \
--cc=dongchenchen2@huawei.com \
--cc=edumazet@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=steffen.klassert@secunet.com \
--cc=timo.teras@iki.fi \
--cc=weiyongjun1@huawei.com \
--cc=yuehaibing@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;
as well as URLs for NNTP newsgroup(s).