|
 |
d44c23 |
From 44d6b1169915913fae640dada5ed931dffff6772 Mon Sep 17 00:00:00 2001
|
|
|
d44c23 |
From: "C. Erastus Toe" <ctoe@redhat.com>
|
|
|
d44c23 |
Date: Fri, 18 Feb 2022 01:09:25 -0500
|
|
|
d44c23 |
Subject: [KPATCH CVE-2021-4028] kpatch fixes for CVE-2021-4028
|
|
|
d44c23 |
|
|
|
d44c23 |
Kernels:
|
|
|
d44c23 |
3.10.0-1160.21.1.el7
|
|
|
d44c23 |
3.10.0-1160.24.1.el7
|
|
|
d44c23 |
3.10.0-1160.25.1.el7
|
|
|
d44c23 |
3.10.0-1160.31.1.el7
|
|
|
d44c23 |
3.10.0-1160.36.2.el7
|
|
|
d44c23 |
3.10.0-1160.41.1.el7
|
|
|
d44c23 |
3.10.0-1160.42.2.el7
|
|
|
d44c23 |
3.10.0-1160.45.1.el7
|
|
|
d44c23 |
3.10.0-1160.49.1.el7
|
|
|
d44c23 |
3.10.0-1160.53.1.el7
|
|
|
d44c23 |
|
|
|
d44c23 |
Changes since last build:
|
|
|
d44c23 |
arches: x86_64 ppc64le
|
|
|
d44c23 |
cma.o: changed function: rdma_listen
|
|
|
d44c23 |
---------------------------
|
|
|
d44c23 |
|
|
|
d44c23 |
Kpatch-MR: https://gitlab.com/redhat/prdsc/rhel/src/kpatch/rhel-7/-/merge_requests/25
|
|
|
d44c23 |
Approved-by: Joe Lawrence (@joe.lawrence)
|
|
|
d44c23 |
Modifications: none
|
|
|
d44c23 |
|
|
|
d44c23 |
commit 00225da7d36440d257a98004ee2e7f288486245b
|
|
|
d44c23 |
Author: Kamal Heib <kheib@redhat.com>
|
|
|
d44c23 |
Date: Sun Jan 16 11:38:26 2022 +0200
|
|
|
d44c23 |
|
|
|
d44c23 |
RDMA/cma: Do not change route.addr.src_addr.ss_family
|
|
|
d44c23 |
|
|
|
d44c23 |
Bugzilla: http://bugzilla.redhat.com/2032075
|
|
|
d44c23 |
CVE: CVE-2021-4028
|
|
|
d44c23 |
Conflicts:
|
|
|
d44c23 |
The conditional statement to verify RDMA_CM_IDLE state is a
|
|
|
d44c23 |
little bit different from the upstream to 7.9.z source. The commit
|
|
|
d44c23 |
732d41c545bb (RDMA/cma: Make the locking for automatic state transition
|
|
|
d44c23 |
more clear) is missing from 7.9.z. So, the context has been modified.
|
|
|
d44c23 |
|
|
|
d44c23 |
commit bc0bdc5afaa740d782fbf936aaeebd65e5c2921d
|
|
|
d44c23 |
Author: Jason Gunthorpe <jgg@nvidia.com>
|
|
|
d44c23 |
Date: Wed Sep 15 17:21:43 2021 -0300
|
|
|
d44c23 |
|
|
|
d44c23 |
RDMA/cma: Do not change route.addr.src_addr.ss_family
|
|
|
d44c23 |
|
|
|
d44c23 |
If the state is not idle then rdma_bind_addr() will immediately fail and
|
|
|
d44c23 |
no change to global state should happen.
|
|
|
d44c23 |
|
|
|
d44c23 |
For instance if the state is already RDMA_CM_LISTEN then this will corrupt
|
|
|
d44c23 |
the src_addr and would cause the test in cma_cancel_operation():
|
|
|
d44c23 |
|
|
|
d44c23 |
if (cma_any_addr(cma_src_addr(id_priv)) && !id_priv->cma_dev)
|
|
|
d44c23 |
|
|
|
d44c23 |
To view a mangled src_addr, eg with a IPv6 loopback address but an IPv4
|
|
|
d44c23 |
family, failing the test.
|
|
|
d44c23 |
|
|
|
d44c23 |
This would manifest as this trace from syzkaller:
|
|
|
d44c23 |
|
|
|
d44c23 |
BUG: KASAN: use-after-free in __list_add_valid+0x93/0xa0 lib/list_debug.c:26
|
|
|
d44c23 |
Read of size 8 at addr ffff8881546491e0 by task syz-executor.1/32204
|
|
|
d44c23 |
|
|
|
d44c23 |
CPU: 1 PID: 32204 Comm: syz-executor.1 Not tainted 5.12.0-rc8-syzkaller #0
|
|
|
d44c23 |
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
|
|
|
d44c23 |
Call Trace:
|
|
|
d44c23 |
__dump_stack lib/dump_stack.c:79 [inline]
|
|
|
d44c23 |
dump_stack+0x141/0x1d7 lib/dump_stack.c:120
|
|
|
d44c23 |
print_address_description.constprop.0.cold+0x5b/0x2f8 mm/kasan/report.c:232
|
|
|
d44c23 |
__kasan_report mm/kasan/report.c:399 [inline]
|
|
|
d44c23 |
kasan_report.cold+0x7c/0xd8 mm/kasan/report.c:416
|
|
|
d44c23 |
__list_add_valid+0x93/0xa0 lib/list_debug.c:26
|
|
|
d44c23 |
__list_add include/linux/list.h:67 [inline]
|
|
|
d44c23 |
list_add_tail include/linux/list.h:100 [inline]
|
|
|
d44c23 |
cma_listen_on_all drivers/infiniband/core/cma.c:2557 [inline]
|
|
|
d44c23 |
rdma_listen+0x787/0xe00 drivers/infiniband/core/cma.c:3751
|
|
|
d44c23 |
ucma_listen+0x16a/0x210 drivers/infiniband/core/ucma.c:1102
|
|
|
d44c23 |
ucma_write+0x259/0x350 drivers/infiniband/core/ucma.c:1732
|
|
|
d44c23 |
vfs_write+0x28e/0xa30 fs/read_write.c:603
|
|
|
d44c23 |
ksys_write+0x1ee/0x250 fs/read_write.c:658
|
|
|
d44c23 |
do_syscall_64+0x2d/0x70 arch/x86/entry/common.c:46
|
|
|
d44c23 |
entry_SYSCALL_64_after_hwframe+0x44/0xae
|
|
|
d44c23 |
|
|
|
d44c23 |
Which is indicating that an rdma_id_private was destroyed without doing
|
|
|
d44c23 |
cma_cancel_listens().
|
|
|
d44c23 |
|
|
|
d44c23 |
Instead of trying to re-use the src_addr memory to indirectly create an
|
|
|
d44c23 |
any address build one explicitly on the stack and bind to that as any
|
|
|
d44c23 |
other normal flow would do.
|
|
|
d44c23 |
|
|
|
d44c23 |
Link: https://lore.kernel.org/r/0-v1-9fbb33f5e201+2a-cma_listen_jgg@nvidia.com
|
|
|
d44c23 |
Cc: stable@vger.kernel.org
|
|
|
d44c23 |
Fixes: 732d41c545bb ("RDMA/cma: Make the locking for automatic state transition more clear")
|
|
|
d44c23 |
Reported-by: syzbot+6bb0528b13611047209c@syzkaller.appspotmail.com
|
|
|
d44c23 |
Tested-by: Hao Sun <sunhao.th@gmail.com>
|
|
|
d44c23 |
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
|
|
|
d44c23 |
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
|
|
|
d44c23 |
|
|
|
d44c23 |
Signed-off-by: Kamal Heib <kheib@redhat.com>
|
|
|
d44c23 |
|
|
|
d44c23 |
Signed-off-by: C. Erastus Toe <ctoe@redhat.com>
|
|
|
d44c23 |
---
|
|
|
d44c23 |
drivers/infiniband/core/cma.c | 9 +++++++--
|
|
|
d44c23 |
1 file changed, 7 insertions(+), 2 deletions(-)
|
|
|
d44c23 |
|
|
|
d44c23 |
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
|
|
|
d44c23 |
index ec473099e445..935f3979c8e2 100644
|
|
|
d44c23 |
--- a/drivers/infiniband/core/cma.c
|
|
|
d44c23 |
+++ b/drivers/infiniband/core/cma.c
|
|
|
d44c23 |
@@ -3467,8 +3467,13 @@ int rdma_listen(struct rdma_cm_id *id, int backlog)
|
|
|
d44c23 |
|
|
|
d44c23 |
id_priv = container_of(id, struct rdma_id_private, id);
|
|
|
d44c23 |
if (id_priv->state == RDMA_CM_IDLE) {
|
|
|
d44c23 |
- id->route.addr.src_addr.ss_family = AF_INET;
|
|
|
d44c23 |
- ret = rdma_bind_addr(id, cma_src_addr(id_priv));
|
|
|
d44c23 |
+ struct sockaddr_in any_in = {
|
|
|
d44c23 |
+ .sin_family = AF_INET,
|
|
|
d44c23 |
+ .sin_addr.s_addr = htonl(INADDR_ANY),
|
|
|
d44c23 |
+ };
|
|
|
d44c23 |
+
|
|
|
d44c23 |
+ /* For a well behaved ULP state will be RDMA_CM_IDLE */
|
|
|
d44c23 |
+ ret = rdma_bind_addr(id, (struct sockaddr *)&any_in);
|
|
|
d44c23 |
if (ret)
|
|
|
d44c23 |
return ret;
|
|
|
d44c23 |
}
|
|
|
d44c23 |
--
|
|
|
d44c23 |
2.26.3
|
|
|
d44c23 |
|
|
|
d44c23 |
|