Blame SOURCES/CVE-2021-4028.patch

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