git: 66a0bc2105e4 - main - ibcore: Fix use-after-free access in ucma_close()

From: Hans Petter Selasky <hselasky_at_FreeBSD.org>
Date: Mon, 13 Jun 2022 15:06:36 UTC
The branch main has been updated by hselasky:

URL: https://cgit.FreeBSD.org/src/commit/?id=66a0bc2105e43e54abfaa9f48b76c28371fa2d62

commit 66a0bc2105e43e54abfaa9f48b76c28371fa2d62
Author:     Hans Petter Selasky <hselasky@FreeBSD.org>
AuthorDate: 2022-06-13 14:55:14 +0000
Commit:     Hans Petter Selasky <hselasky@FreeBSD.org>
CommitDate: 2022-06-13 15:00:16 +0000

    ibcore: Fix use-after-free access in ucma_close()
    
    The error in ucma_create_id() left ctx in the list of contexts belong
    to ucma file descriptor. The attempt to close this file descriptor causes
    to use-after-free accesses while iterating over such list.
    
    Linux commit:
    ed65a4dc22083e73bac599ded6a262318cad7baf
    
    PR:             264650
    MFC after:      1 week
    Sponsored by:   NVIDIA Networking
---
 sys/ofed/drivers/infiniband/core/ib_ucma.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys/ofed/drivers/infiniband/core/ib_ucma.c b/sys/ofed/drivers/infiniband/core/ib_ucma.c
index 878e4d348234..0082c60f0b6c 100644
--- a/sys/ofed/drivers/infiniband/core/ib_ucma.c
+++ b/sys/ofed/drivers/infiniband/core/ib_ucma.c
@@ -508,6 +508,9 @@ err1:
 	mutex_lock(&mut);
 	idr_remove(&ctx_idr, ctx->id);
 	mutex_unlock(&mut);
+	mutex_lock(&file->mut);
+	list_del(&ctx->list);
+	mutex_unlock(&file->mut);
 	kfree(ctx);
 	return ret;
 }