Skip to contentSkip to conversation

mm-memory-avoid-unnecessary-kernel-user-pointer-conversion.patch removed from -mm tree

merged [email protected] 1 participant 1 message Nov 11, 2021

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm/memory.c: avoid unnecessary kernel/user pointer conversion
has been removed from the -mm tree. Its filename was
mm-memory-avoid-unnecessary-kernel-user-pointer-conversion.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Amit Daniel Kachhap <[email protected]>
Subject: mm/memory.c: avoid unnecessary kernel/user pointer conversion

Annotating a pointer from __user to kernel and then back again might confuse sparse. In copy_huge_page_from_user() it can be avoided by removing the intermediate variable since it is never used.

---

 mm/memory.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-avoid-unnecessary-kernel-user-pointer-conversion +1 -3
@@ -5421,7 +5421,6 @@ long copy_huge_page_from_user(struct pag
 				unsigned int pages_per_huge_page,
 				bool allow_pagefault)
 {
-	void *src = (void *)usr_src;
 	void *page_kaddr;
 	unsigned long i, rc = 0;
 	unsigned long ret_val = pages_per_huge_page * PAGE_SIZE;
@@ -5434,8 +5433,7 @@ long copy_huge_page_from_user(struct pag
 		else
 			page_kaddr = kmap_atomic(subpage);
 		rc = copy_from_user(page_kaddr,
-				(const void __user *)(src + i * PAGE_SIZE),
-				PAGE_SIZE);
+				usr_src + i * PAGE_SIZE, PAGE_SIZE);
 		if (allow_pagefault)
 			kunmap(subpage);
 		else

_

Patches currently in -mm which might be from [email protected] are