* [PATCH v3] nfp: fix use-after-free in area_cache_get()
@ 2022-08-10 7:30 Jialiang Wang
2022-08-11 4:10 ` Yinjun Zhang
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Jialiang Wang @ 2022-08-10 7:30 UTC (permalink / raw)
To: simon.horman, kuba, davem, edumazet, pabeni, niejianglei2021,
wangjialiang0806
Cc: oss-drivers, netdev, linux-kernel
area_cache_get() is used to distribute cache->area and set cache->id,
and if cache->id is not 0 and cache->area->kref refcount is 0, it will
release the cache->area by nfp_cpp_area_release(). area_cache_get()
set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
is already set but the refcount is not increased as expected. At this
time, calling the nfp_cpp_area_release() will cause use-after-free.
To avoid the use-after-free, set cache->id after area_init() and
nfp_cpp_area_acquire() complete successfully.
Note: This vulnerability is triggerable by providing emulated device
equipped with specified configuration.
BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
/x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
Call Trace:
<TASK>
nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
Allocated by task 1:
nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
/netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
/netronome/nfp/nfp_main.c:744)
Freed by task 1:
kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
/netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
/netronome/nfp/nfpcore/nfp_cpplib.c:48)
Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
---
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
index 34c0d2ddf9ef..a8286d0032d1 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
@@ -874,7 +874,6 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
}
/* Adjust the start address to be cache size aligned */
- cache->id = id;
cache->addr = addr & ~(u64)(cache->size - 1);
/* Re-init to the new ID and address */
@@ -894,6 +893,8 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
return NULL;
}
+ cache->id = id;
+
exit:
/* Adjust offset */
*offset = addr - cache->addr;
--
2.17.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* RE: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-08-10 7:30 [PATCH v3] nfp: fix use-after-free in area_cache_get() Jialiang Wang
@ 2022-08-11 4:10 ` Yinjun Zhang
2022-08-11 8:34 ` Simon Horman
2022-08-11 16:10 ` patchwork-bot+netdevbpf
2022-12-07 12:21 ` Lee Jones
2 siblings, 1 reply; 10+ messages in thread
From: Yinjun Zhang @ 2022-08-11 4:10 UTC (permalink / raw)
To: Jialiang Wang, Simon Horman, kuba, davem, edumazet, pabeni,
niejianglei2021
Cc: oss-drivers, netdev, linux-kernel
On Wed, 10 Aug 2022 15:30:57 +0800 Jialiang Wang wrote:
> area_cache_get() is used to distribute cache->area and set cache->id,
> and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> release the cache->area by nfp_cpp_area_release(). area_cache_get()
> set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
>
> But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> is already set but the refcount is not increased as expected. At this
> time, calling the nfp_cpp_area_release() will cause use-after-free.
>
> To avoid the use-after-free, set cache->id after area_init() and
> nfp_cpp_area_acquire() complete successfully.
>
> Note: This vulnerability is triggerable by providing emulated device
> equipped with specified configuration.
>
> BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:7
> 60)
> Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
>
> Call Trace:
> <TASK>
> nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
>
> Allocated by task 1:
> nfp_cpp_area_alloc_with_name
> (/home/user/Kernel/v5.19/x86_64/src/drivers
> /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> nfp_cpp_area_cache_add
> (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> nfp_cpp_from_operations
> (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfp_main.c:744)
>
> Freed by task 1:
> kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfpcore/nfp_cppcore.c:924
> /home/user/Kernel/v5.19/x86_64
> /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfpcore/nfp_cpplib.c:48)
>
> Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
Thanks.
Reviewed-by: Yinjun Zhang <yinjun.zhang@corigine.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-08-11 4:10 ` Yinjun Zhang
@ 2022-08-11 8:34 ` Simon Horman
0 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2022-08-11 8:34 UTC (permalink / raw)
To: Yinjun Zhang
Cc: Jialiang Wang, kuba, davem, edumazet, pabeni, niejianglei2021,
oss-drivers, netdev, linux-kernel
On Thu, Aug 11, 2022 at 05:10:44AM +0100, Yinjun Zhang wrote:
> On Wed, 10 Aug 2022 15:30:57 +0800 Jialiang Wang wrote:
> > area_cache_get() is used to distribute cache->area and set cache->id,
> > and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> > release the cache->area by nfp_cpp_area_release(). area_cache_get()
> > set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
> >
> > But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> > is already set but the refcount is not increased as expected. At this
> > time, calling the nfp_cpp_area_release() will cause use-after-free.
> >
> > To avoid the use-after-free, set cache->id after area_init() and
> > nfp_cpp_area_acquire() complete successfully.
> >
> > Note: This vulnerability is triggerable by providing emulated device
> > equipped with specified configuration.
> >
> > BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> > /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:7
> > 60)
> > Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
> >
> > Call Trace:
> > <TASK>
> > nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
> >
> > Allocated by task 1:
> > nfp_cpp_area_alloc_with_name
> > (/home/user/Kernel/v5.19/x86_64/src/drivers
> > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> > nfp_cpp_area_cache_add
> > (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> > nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> > nfp_cpp_from_operations
> > (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> > nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfp_main.c:744)
> >
> > Freed by task 1:
> > kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> > nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfpcore/nfp_cppcore.c:924
> > /home/user/Kernel/v5.19/x86_64
> > /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> > nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfpcore/nfp_cpplib.c:48)
> >
> > Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
>
> Thanks.
> Reviewed-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Acked-by: Simon Horman <simon.horman@corigine.com>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-08-10 7:30 [PATCH v3] nfp: fix use-after-free in area_cache_get() Jialiang Wang
2022-08-11 4:10 ` Yinjun Zhang
@ 2022-08-11 16:10 ` patchwork-bot+netdevbpf
2022-12-07 12:21 ` Lee Jones
2 siblings, 0 replies; 10+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-08-11 16:10 UTC (permalink / raw)
To: Jialiang Wang
Cc: simon.horman, kuba, davem, edumazet, pabeni, niejianglei2021,
oss-drivers, netdev, linux-kernel
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 10 Aug 2022 15:30:57 +0800 you wrote:
> area_cache_get() is used to distribute cache->area and set cache->id,
> and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> release the cache->area by nfp_cpp_area_release(). area_cache_get()
> set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
>
> But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> is already set but the refcount is not increased as expected. At this
> time, calling the nfp_cpp_area_release() will cause use-after-free.
>
> [...]
Here is the summary with links:
- [v3] nfp: fix use-after-free in area_cache_get()
https://git.kernel.org/netdev/net/c/02e1a114fdb7
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-08-10 7:30 [PATCH v3] nfp: fix use-after-free in area_cache_get() Jialiang Wang
2022-08-11 4:10 ` Yinjun Zhang
2022-08-11 16:10 ` patchwork-bot+netdevbpf
@ 2022-12-07 12:21 ` Lee Jones
2022-12-08 14:09 ` Simon Horman
2 siblings, 1 reply; 10+ messages in thread
From: Lee Jones @ 2022-12-07 12:21 UTC (permalink / raw)
To: Jialiang Wang, stable
Cc: simon.horman, kuba, davem, edumazet, pabeni, niejianglei2021,
oss-drivers, netdev, linux-kernel
On Wed, 10 Aug 2022, Jialiang Wang wrote:
> area_cache_get() is used to distribute cache->area and set cache->id,
> and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> release the cache->area by nfp_cpp_area_release(). area_cache_get()
> set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
>
> But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> is already set but the refcount is not increased as expected. At this
> time, calling the nfp_cpp_area_release() will cause use-after-free.
>
> To avoid the use-after-free, set cache->id after area_init() and
> nfp_cpp_area_acquire() complete successfully.
>
> Note: This vulnerability is triggerable by providing emulated device
> equipped with specified configuration.
>
> BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
>
> Call Trace:
> <TASK>
> nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
>
> Allocated by task 1:
> nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
> /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfp_main.c:744)
>
> Freed by task 1:
> kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
> /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> /netronome/nfp/nfpcore/nfp_cpplib.c:48)
>
> Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
Any reason why this doesn't have a Fixes: tag applied and/or didn't
get sent to Stable?
Looks as if this needs to go back as far as v4.19.
Fixes: 4cb584e0ee7df ("nfp: add CPP access core")
commit 02e1a114fdb71e59ee6770294166c30d437bf86a upstream.
> ---
> drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> index 34c0d2ddf9ef..a8286d0032d1 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> @@ -874,7 +874,6 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
> }
>
> /* Adjust the start address to be cache size aligned */
> - cache->id = id;
> cache->addr = addr & ~(u64)(cache->size - 1);
>
> /* Re-init to the new ID and address */
> @@ -894,6 +893,8 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
> return NULL;
> }
>
> + cache->id = id;
> +
> exit:
> /* Adjust offset */
> *offset = addr - cache->addr;
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-12-07 12:21 ` Lee Jones
@ 2022-12-08 14:09 ` Simon Horman
2022-12-14 10:20 ` Lee Jones
2022-12-15 9:25 ` Lee Jones
0 siblings, 2 replies; 10+ messages in thread
From: Simon Horman @ 2022-12-08 14:09 UTC (permalink / raw)
To: Lee Jones
Cc: Jialiang Wang, stable, kuba, davem, edumazet, pabeni,
niejianglei2021, oss-drivers, netdev, linux-kernel
On Wed, Dec 07, 2022 at 12:21:10PM +0000, Lee Jones wrote:
> [Some people who received this message don't often get email from lee@kernel.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
>
> On Wed, 10 Aug 2022, Jialiang Wang wrote:
>
> > area_cache_get() is used to distribute cache->area and set cache->id,
> > and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> > release the cache->area by nfp_cpp_area_release(). area_cache_get()
> > set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
> >
> > But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> > is already set but the refcount is not increased as expected. At this
> > time, calling the nfp_cpp_area_release() will cause use-after-free.
> >
> > To avoid the use-after-free, set cache->id after area_init() and
> > nfp_cpp_area_acquire() complete successfully.
> >
> > Note: This vulnerability is triggerable by providing emulated device
> > equipped with specified configuration.
> >
> > BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> > /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
> >
> > Call Trace:
> > <TASK>
> > nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
> >
> > Allocated by task 1:
> > nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
> > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> > nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> > nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> > nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> > nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfp_main.c:744)
> >
> > Freed by task 1:
> > kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> > nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
> > /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> > nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > /netronome/nfp/nfpcore/nfp_cpplib.c:48)
> >
> > Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
>
> Any reason why this doesn't have a Fixes: tag applied and/or didn't
> get sent to Stable?
>
> Looks as if this needs to go back as far as v4.19.
>
> Fixes: 4cb584e0ee7df ("nfp: add CPP access core")
>
> commit 02e1a114fdb71e59ee6770294166c30d437bf86a upstream.
Hi Lee,
From my side this looks like an oversight.
> > ---
> > drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> > index 34c0d2ddf9ef..a8286d0032d1 100644
> > --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> > +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> > @@ -874,7 +874,6 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
> > }
> >
> > /* Adjust the start address to be cache size aligned */
> > - cache->id = id;
> > cache->addr = addr & ~(u64)(cache->size - 1);
> >
> > /* Re-init to the new ID and address */
> > @@ -894,6 +893,8 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
> > return NULL;
> > }
> >
> > + cache->id = id;
> > +
> > exit:
> > /* Adjust offset */
> > *offset = addr - cache->addr;
>
> --
> Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-12-08 14:09 ` Simon Horman
@ 2022-12-14 10:20 ` Lee Jones
2022-12-15 9:25 ` Lee Jones
1 sibling, 0 replies; 10+ messages in thread
From: Lee Jones @ 2022-12-14 10:20 UTC (permalink / raw)
To: Simon Horman
Cc: Jialiang Wang, stable, kuba, davem, edumazet, pabeni,
niejianglei2021, oss-drivers, netdev, linux-kernel
Dear Stable,
On Thu, 08 Dec 2022, Simon Horman wrote:
> On Wed, Dec 07, 2022 at 12:21:10PM +0000, Lee Jones wrote:
> > [Some people who received this message don't often get email from lee@kernel.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
> >
> > On Wed, 10 Aug 2022, Jialiang Wang wrote:
> >
> > > area_cache_get() is used to distribute cache->area and set cache->id,
> > > and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> > > release the cache->area by nfp_cpp_area_release(). area_cache_get()
> > > set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
> > >
> > > But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> > > is already set but the refcount is not increased as expected. At this
> > > time, calling the nfp_cpp_area_release() will cause use-after-free.
> > >
> > > To avoid the use-after-free, set cache->id after area_init() and
> > > nfp_cpp_area_acquire() complete successfully.
> > >
> > > Note: This vulnerability is triggerable by providing emulated device
> > > equipped with specified configuration.
> > >
> > > BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> > > /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
> > >
> > > Call Trace:
> > > <TASK>
> > > nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
> > >
> > > Allocated by task 1:
> > > nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> > > nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> > > nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> > > nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> > > nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfp_main.c:744)
> > >
> > > Freed by task 1:
> > > kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> > > nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
> > > /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> > > nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfpcore/nfp_cpplib.c:48)
> > >
> > > Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
> >
> > Any reason why this doesn't have a Fixes: tag applied and/or didn't
> > get sent to Stable?
> >
> > Looks as if this needs to go back as far as v4.19.
> >
> > Fixes: 4cb584e0ee7df ("nfp: add CPP access core")
> >
> > commit 02e1a114fdb71e59ee6770294166c30d437bf86a upstream.
>
> Hi Lee,
>
> From my side this looks like an oversight.
Understood, thank you Simon.
Stable Team, are you prepared to take this patch with the above info?
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-12-08 14:09 ` Simon Horman
2022-12-14 10:20 ` Lee Jones
@ 2022-12-15 9:25 ` Lee Jones
2022-12-15 9:45 ` Greg KH
1 sibling, 1 reply; 10+ messages in thread
From: Lee Jones @ 2022-12-15 9:25 UTC (permalink / raw)
To: Simon Horman
Cc: Jialiang Wang, stable, kuba, davem, edumazet, pabeni,
niejianglei2021, oss-drivers, netdev, linux-kernel
Dear Stable,
[NB: Re-poking Stable with the correct contact address this time! :)]
> > > area_cache_get() is used to distribute cache->area and set cache->id,
> > > and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> > > release the cache->area by nfp_cpp_area_release(). area_cache_get()
> > > set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
> > >
> > > But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> > > is already set but the refcount is not increased as expected. At this
> > > time, calling the nfp_cpp_area_release() will cause use-after-free.
> > >
> > > To avoid the use-after-free, set cache->id after area_init() and
> > > nfp_cpp_area_acquire() complete successfully.
> > >
> > > Note: This vulnerability is triggerable by providing emulated device
> > > equipped with specified configuration.
> > >
> > > BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> > > /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
> > >
> > > Call Trace:
> > > <TASK>
> > > nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
> > >
> > > Allocated by task 1:
> > > nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> > > nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> > > nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> > > nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> > > nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfp_main.c:744)
> > >
> > > Freed by task 1:
> > > kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> > > nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
> > > /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> > > nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > /netronome/nfp/nfpcore/nfp_cpplib.c:48)
> > >
> > > Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
> >
> > Any reason why this doesn't have a Fixes: tag applied and/or didn't
> > get sent to Stable?
> >
> > Looks as if this needs to go back as far as v4.19.
> >
> > Fixes: 4cb584e0ee7df ("nfp: add CPP access core")
> >
> > commit 02e1a114fdb71e59ee6770294166c30d437bf86a upstream.
Would you be able to take this with the information provided please?
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-12-15 9:25 ` Lee Jones
@ 2022-12-15 9:45 ` Greg KH
2022-12-15 9:51 ` Lee Jones
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2022-12-15 9:45 UTC (permalink / raw)
To: Lee Jones
Cc: Simon Horman, Jialiang Wang, stable, kuba, davem, edumazet,
pabeni, niejianglei2021, oss-drivers, netdev, linux-kernel
On Thu, Dec 15, 2022 at 09:25:23AM +0000, Lee Jones wrote:
> Dear Stable,
>
> [NB: Re-poking Stable with the correct contact address this time! :)]
>
> > > > area_cache_get() is used to distribute cache->area and set cache->id,
> > > > and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> > > > release the cache->area by nfp_cpp_area_release(). area_cache_get()
> > > > set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
> > > >
> > > > But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> > > > is already set but the refcount is not increased as expected. At this
> > > > time, calling the nfp_cpp_area_release() will cause use-after-free.
> > > >
> > > > To avoid the use-after-free, set cache->id after area_init() and
> > > > nfp_cpp_area_acquire() complete successfully.
> > > >
> > > > Note: This vulnerability is triggerable by providing emulated device
> > > > equipped with specified configuration.
> > > >
> > > > BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> > > > /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > > Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
> > > >
> > > > Call Trace:
> > > > <TASK>
> > > > nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > > /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
> > > >
> > > > Allocated by task 1:
> > > > nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> > > > nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> > > > nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> > > > nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> > > > nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > /netronome/nfp/nfp_main.c:744)
> > > >
> > > > Freed by task 1:
> > > > kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> > > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> > > > nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > /netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
> > > > /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> > > > nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > /netronome/nfp/nfpcore/nfp_cpplib.c:48)
> > > >
> > > > Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
> > >
> > > Any reason why this doesn't have a Fixes: tag applied and/or didn't
> > > get sent to Stable?
> > >
> > > Looks as if this needs to go back as far as v4.19.
> > >
> > > Fixes: 4cb584e0ee7df ("nfp: add CPP access core")
> > >
> > > commit 02e1a114fdb71e59ee6770294166c30d437bf86a upstream.
>
> Would you be able to take this with the information provided please?
You really want this back to 4.14.y, as 4cb584e0ee7df ("nfp: add CPP
access core") showed up in the 4.11 release, right?
if so, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v3] nfp: fix use-after-free in area_cache_get()
2022-12-15 9:45 ` Greg KH
@ 2022-12-15 9:51 ` Lee Jones
0 siblings, 0 replies; 10+ messages in thread
From: Lee Jones @ 2022-12-15 9:51 UTC (permalink / raw)
To: Greg KH
Cc: Simon Horman, Jialiang Wang, stable, kuba, davem, edumazet,
pabeni, niejianglei2021, oss-drivers, netdev, linux-kernel
On Thu, 15 Dec 2022, Greg KH wrote:
> On Thu, Dec 15, 2022 at 09:25:23AM +0000, Lee Jones wrote:
> > Dear Stable,
> >
> > [NB: Re-poking Stable with the correct contact address this time! :)]
> >
> > > > > area_cache_get() is used to distribute cache->area and set cache->id,
> > > > > and if cache->id is not 0 and cache->area->kref refcount is 0, it will
> > > > > release the cache->area by nfp_cpp_area_release(). area_cache_get()
> > > > > set cache->id before cpp->op->area_init() and nfp_cpp_area_acquire().
> > > > >
> > > > > But if area_init() or nfp_cpp_area_acquire() fails, the cache->id is
> > > > > is already set but the refcount is not increased as expected. At this
> > > > > time, calling the nfp_cpp_area_release() will cause use-after-free.
> > > > >
> > > > > To avoid the use-after-free, set cache->id after area_init() and
> > > > > nfp_cpp_area_acquire() complete successfully.
> > > > >
> > > > > Note: This vulnerability is triggerable by providing emulated device
> > > > > equipped with specified configuration.
> > > > >
> > > > > BUG: KASAN: use-after-free in nfp6000_area_init (/home/user/Kernel/v5.19
> > > > > /x86_64/src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > > > Write of size 4 at addr ffff888005b7f4a0 by task swapper/0/1
> > > > >
> > > > > Call Trace:
> > > > > <TASK>
> > > > > nfp6000_area_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > > > /ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c:760)
> > > > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:884)
> > > > >
> > > > > Allocated by task 1:
> > > > > nfp_cpp_area_alloc_with_name (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:303)
> > > > > nfp_cpp_area_cache_add (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:802)
> > > > > nfp6000_init (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > > /netronome/nfp/nfpcore/nfp6000_pcie.c:1230)
> > > > > nfp_cpp_from_operations (/home/user/Kernel/v5.19/x86_64/src/drivers/net
> > > > > /ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:1215)
> > > > > nfp_pci_probe (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > > /netronome/nfp/nfp_main.c:744)
> > > > >
> > > > > Freed by task 1:
> > > > > kfree (/home/user/Kernel/v5.19/x86_64/src/mm/slub.c:4562)
> > > > > area_cache_get.constprop.8 (/home/user/Kernel/v5.19/x86_64/src/drivers
> > > > > /net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:873)
> > > > > nfp_cpp_read (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > > /netronome/nfp/nfpcore/nfp_cppcore.c:924 /home/user/Kernel/v5.19/x86_64
> > > > > /src/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c:973)
> > > > > nfp_cpp_readl (/home/user/Kernel/v5.19/x86_64/src/drivers/net/ethernet
> > > > > /netronome/nfp/nfpcore/nfp_cpplib.c:48)
> > > > >
> > > > > Signed-off-by: Jialiang Wang <wangjialiang0806@163.com>
> > > >
> > > > Any reason why this doesn't have a Fixes: tag applied and/or didn't
> > > > get sent to Stable?
> > > >
> > > > Looks as if this needs to go back as far as v4.19.
> > > >
> > > > Fixes: 4cb584e0ee7df ("nfp: add CPP access core")
> > > >
> > > > commit 02e1a114fdb71e59ee6770294166c30d437bf86a upstream.
> >
> > Would you be able to take this with the information provided please?
>
> You really want this back to 4.14.y, as 4cb584e0ee7df ("nfp: add CPP
> access core") showed up in the 4.11 release, right?
Yes please. Brain said one thing, fingers typed another!
> if so, now queued up.
Thank you.
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-12-15 9:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-10 7:30 [PATCH v3] nfp: fix use-after-free in area_cache_get() Jialiang Wang
2022-08-11 4:10 ` Yinjun Zhang
2022-08-11 8:34 ` Simon Horman
2022-08-11 16:10 ` patchwork-bot+netdevbpf
2022-12-07 12:21 ` Lee Jones
2022-12-08 14:09 ` Simon Horman
2022-12-14 10:20 ` Lee Jones
2022-12-15 9:25 ` Lee Jones
2022-12-15 9:45 ` Greg KH
2022-12-15 9:51 ` Lee Jones
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).