From: Liam R. Howlett <Liam.Howlett@oracle.com>
Date: Fri, 16 Jun 2023 18:57:51 +0000 (-0400)
Subject: patch 2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=eb0acec827d193703367a3c62db9adfafce228cd;p=users%2Fjedix%2Flinux-maple.git

patch 2

Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com>
---

diff --git a/mm/memory.c b/mm/memory.c
index c291511c3155..7e2d473e70bb 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5279,8 +5279,7 @@ static inline bool get_mmap_lock_carefully(struct mm_struct *mm, struct pt_regs
 			return false;
 	}
 
-	mmap_read_lock(mm);
-	return true;
+	return !mmap_read_lock_killable(mm);
 }
 
 static inline bool upgrade_mmap_lock_carefully(struct mm_struct *mm, struct pt_regs *regs)
@@ -5304,8 +5303,7 @@ static inline bool upgrade_mmap_lock_carefully(struct mm_struct *mm, struct pt_r
 		if (!search_exception_tables(ip))
 			return false;
 	}
-	mmap_write_lock(mm);
-	return true;
+	return !mmap_write_lock_killable(mm);
 }
 
 /*