* [PATCH] RDMA/cma: Do not change route.addr.src_addr.ss_family
@ 2021-09-15 20:21 Jason Gunthorpe
2021-09-22 7:46 ` Leon Romanovsky
2021-09-23 20:07 ` Jason Gunthorpe
0 siblings, 2 replies; 3+ messages in thread
From: Jason Gunthorpe @ 2021-09-15 20:21 UTC (permalink / raw)
To: linux-rdma; +Cc: Leon Romanovsky, stable, syzbot+6bb0528b13611047209c
If the state is not idle then rdma_bind_addr() will immediately fail and
no change to global state should happen.
For instance if the state is already RDMA_CM_LISTEN then this will corrupt
the src_addr and would cause the test in cma_cancel_operation():
if (cma_any_addr(cma_src_addr(id_priv)) && !id_priv->cma_dev)
To view a mangled src_addr, eg with a IPv6 loopback address but an IPv4
family, failing the test.
This would manifest as this trace from syzkaller:
BUG: KASAN: use-after-free in __list_add_valid+0x93/0xa0 lib/list_debug.c:26
Read of size 8 at addr ffff8881546491e0 by task syz-executor.1/32204
CPU: 1 PID: 32204 Comm: syz-executor.1 Not tainted 5.12.0-rc8-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Call Trace:
__dump_stack lib/dump_stack.c:79 [inline]
dump_stack+0x141/0x1d7 lib/dump_stack.c:120
print_address_description.constprop.0.cold+0x5b/0x2f8 mm/kasan/report.c:232
__kasan_report mm/kasan/report.c:399 [inline]
kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:416
__list_add_valid+0x93/0xa0 lib/list_debug.c:26
__list_add include/linux/list.h:67 [inline]
list_add_tail include/linux/list.h:100 [inline]
cma_listen_on_all drivers/infiniband/core/cma.c:2557 [inline]
rdma_listen+0x787/0xe00 drivers/infiniband/core/cma.c:3751
ucma_listen+0x16a/0x210 drivers/infiniband/core/ucma.c:1102
ucma_write+0x259/0x350 drivers/infiniband/core/ucma.c:1732
vfs_write+0x28e/0xa30 fs/read_write.c:603
ksys_write+0x1ee/0x250 fs/read_write.c:658
do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
entry_SYSCALL_64_after_hwframe+0x44/0xae
Which is likely indicating that an rdma_id_private was destroyed without
doing cma_cancel_listens().
Instead of trying to re-use the src_addr memory to indirectly create an
any address build one explicitly on the stack and bind to that as any
other normal flow would do.
Cc: stable@vger.kernel.org
Fixes: 732d41c545bb ("RDMA/cma: Make the locking for automatic state transition more clear")
Reported-by: syzbot+6bb0528b13611047209c@syzkaller.appspotmail.com
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
---
drivers/infiniband/core/cma.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index c40791baced588..a1315b4da1a6bf 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -3771,9 +3771,13 @@ int rdma_listen(struct rdma_cm_id *id, int backlog)
int ret;
if (!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND, RDMA_CM_LISTEN)) {
+ struct sockaddr_in any_in = {
+ .sin_family = AF_INET,
+ .sin_addr.s_addr = htonl(INADDR_ANY),
+ };
+
/* For a well behaved ULP state will be RDMA_CM_IDLE */
- id->route.addr.src_addr.ss_family = AF_INET;
- ret = rdma_bind_addr(id, cma_src_addr(id_priv));
+ ret = rdma_bind_addr(id, (struct sockaddr *)&any_in);
if (ret)
return ret;
if (WARN_ON(!cma_comp_exch(id_priv, RDMA_CM_ADDR_BOUND,
base-commit: ad17bbef3dd573da937816edc0ab84fed6a17fa6
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] RDMA/cma: Do not change route.addr.src_addr.ss_family
2021-09-15 20:21 [PATCH] RDMA/cma: Do not change route.addr.src_addr.ss_family Jason Gunthorpe
@ 2021-09-22 7:46 ` Leon Romanovsky
2021-09-23 20:07 ` Jason Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Leon Romanovsky @ 2021-09-22 7:46 UTC (permalink / raw)
To: Jason Gunthorpe; +Cc: linux-rdma, stable, syzbot+6bb0528b13611047209c
On Wed, Sep 15, 2021 at 05:21:43PM -0300, Jason Gunthorpe wrote:
> If the state is not idle then rdma_bind_addr() will immediately fail and
> no change to global state should happen.
>
> For instance if the state is already RDMA_CM_LISTEN then this will corrupt
> the src_addr and would cause the test in cma_cancel_operation():
>
> if (cma_any_addr(cma_src_addr(id_priv)) && !id_priv->cma_dev)
>
> To view a mangled src_addr, eg with a IPv6 loopback address but an IPv4
> family, failing the test.
>
> This would manifest as this trace from syzkaller:
>
> BUG: KASAN: use-after-free in __list_add_valid+0x93/0xa0 lib/list_debug.c:26
> Read of size 8 at addr ffff8881546491e0 by task syz-executor.1/32204
>
> CPU: 1 PID: 32204 Comm: syz-executor.1 Not tainted 5.12.0-rc8-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
> Call Trace:
> __dump_stack lib/dump_stack.c:79 [inline]
> dump_stack+0x141/0x1d7 lib/dump_stack.c:120
> print_address_description.constprop.0.cold+0x5b/0x2f8 mm/kasan/report.c:232
> __kasan_report mm/kasan/report.c:399 [inline]
> kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:416
> __list_add_valid+0x93/0xa0 lib/list_debug.c:26
> __list_add include/linux/list.h:67 [inline]
> list_add_tail include/linux/list.h:100 [inline]
> cma_listen_on_all drivers/infiniband/core/cma.c:2557 [inline]
> rdma_listen+0x787/0xe00 drivers/infiniband/core/cma.c:3751
> ucma_listen+0x16a/0x210 drivers/infiniband/core/ucma.c:1102
> ucma_write+0x259/0x350 drivers/infiniband/core/ucma.c:1732
> vfs_write+0x28e/0xa30 fs/read_write.c:603
> ksys_write+0x1ee/0x250 fs/read_write.c:658
> do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> entry_SYSCALL_64_after_hwframe+0x44/0xae
>
> Which is likely indicating that an rdma_id_private was destroyed without
> doing cma_cancel_listens().
>
> Instead of trying to re-use the src_addr memory to indirectly create an
> any address build one explicitly on the stack and bind to that as any
> other normal flow would do.
>
> Cc: stable@vger.kernel.org
> Fixes: 732d41c545bb ("RDMA/cma: Make the locking for automatic state transition more clear")
> Reported-by: syzbot+6bb0528b13611047209c@syzkaller.appspotmail.com
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> ---
> drivers/infiniband/core/cma.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] RDMA/cma: Do not change route.addr.src_addr.ss_family
2021-09-15 20:21 [PATCH] RDMA/cma: Do not change route.addr.src_addr.ss_family Jason Gunthorpe
2021-09-22 7:46 ` Leon Romanovsky
@ 2021-09-23 20:07 ` Jason Gunthorpe
1 sibling, 0 replies; 3+ messages in thread
From: Jason Gunthorpe @ 2021-09-23 20:07 UTC (permalink / raw)
To: linux-rdma; +Cc: Leon Romanovsky, stable, syzbot+6bb0528b13611047209c
On Wed, Sep 15, 2021 at 05:21:43PM -0300, Jason Gunthorpe wrote:
> If the state is not idle then rdma_bind_addr() will immediately fail and
> no change to global state should happen.
>
> For instance if the state is already RDMA_CM_LISTEN then this will corrupt
> the src_addr and would cause the test in cma_cancel_operation():
>
> if (cma_any_addr(cma_src_addr(id_priv)) && !id_priv->cma_dev)
>
> To view a mangled src_addr, eg with a IPv6 loopback address but an IPv4
> family, failing the test.
>
> This would manifest as this trace from syzkaller:
>
> BUG: KASAN: use-after-free in __list_add_valid+0x93/0xa0 lib/list_debug.c:26
> Read of size 8 at addr ffff8881546491e0 by task syz-executor.1/32204
>
> CPU: 1 PID: 32204 Comm: syz-executor.1 Not tainted 5.12.0-rc8-syzkaller #0
> Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
> Call Trace:
> __dump_stack lib/dump_stack.c:79 [inline]
> dump_stack+0x141/0x1d7 lib/dump_stack.c:120
> print_address_description.constprop.0.cold+0x5b/0x2f8 mm/kasan/report.c:232
> __kasan_report mm/kasan/report.c:399 [inline]
> kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:416
> __list_add_valid+0x93/0xa0 lib/list_debug.c:26
> __list_add include/linux/list.h:67 [inline]
> list_add_tail include/linux/list.h:100 [inline]
> cma_listen_on_all drivers/infiniband/core/cma.c:2557 [inline]
> rdma_listen+0x787/0xe00 drivers/infiniband/core/cma.c:3751
> ucma_listen+0x16a/0x210 drivers/infiniband/core/ucma.c:1102
> ucma_write+0x259/0x350 drivers/infiniband/core/ucma.c:1732
> vfs_write+0x28e/0xa30 fs/read_write.c:603
> ksys_write+0x1ee/0x250 fs/read_write.c:658
> do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
> entry_SYSCALL_64_after_hwframe+0x44/0xae
>
> Which is likely indicating that an rdma_id_private was destroyed without
> doing cma_cancel_listens().
>
> Instead of trying to re-use the src_addr memory to indirectly create an
> any address build one explicitly on the stack and bind to that as any
> other normal flow would do.
>
> Cc: stable@vger.kernel.org
> Fixes: 732d41c545bb ("RDMA/cma: Make the locking for automatic state transition more clear")
> Reported-by: syzbot+6bb0528b13611047209c@syzkaller.appspotmail.com
> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
> Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
> ---
> drivers/infiniband/core/cma.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
Applied to for-rc
Jason
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-23 20:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-15 20:21 [PATCH] RDMA/cma: Do not change route.addr.src_addr.ss_family Jason Gunthorpe
2021-09-22 7:46 ` Leon Romanovsky
2021-09-23 20:07 ` Jason Gunthorpe
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).