Skip to contentSkip to conversation

kmsan-add-missing-__user-tags.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 29, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kmsan: add missing __user tags
has been removed from the -mm tree. Its filename was
kmsan-add-missing-__user-tags.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Ilya Leoshkevich <[email protected]>
Subject: kmsan: add missing __user tags
Date: Thu, 27 Jun 2024 16:57:46 +0200

sparse complains that __user pointers are being passed to functions that expect non-__user ones. In all cases, these functions are in fact working with user pointers, only the tag is missing. Add it.

---

 mm/kmsan/core.c   |    4 ++--
 mm/kmsan/kmsan.h  |    6 +++---
 mm/kmsan/report.c |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
mm/kmsan/core.c renamed from mm/kmsan/core.c~kmsan-add-missing-__user-tags +2 -2
@@ -249,8 +249,8 @@ struct page *kmsan_vmalloc_to_page_or_nu
 		return NULL;
 }
 
-void kmsan_internal_check_memory(void *addr, size_t size, const void *user_addr,
-				 int reason)
+void kmsan_internal_check_memory(void *addr, size_t size,
+				 const void __user *user_addr, int reason)
 {
 	depot_stack_handle_t cur_origin = 0, new_origin = 0;
 	unsigned long addr64 = (unsigned long)addr;
mm/kmsan/kmsan.h renamed from mm/kmsan/kmsan.h~kmsan-add-missing-__user-tags +3 -3
@@ -73,7 +73,7 @@ void kmsan_print_origin(depot_stack_hand
  * @off_last corresponding to different @origin values.
  */
 void kmsan_report(depot_stack_handle_t origin, void *address, int size,
-		  int off_first, int off_last, const void *user_addr,
+		  int off_first, int off_last, const void __user *user_addr,
 		  enum kmsan_bug_reason reason);
 
 DECLARE_PER_CPU(struct kmsan_ctx, kmsan_percpu_ctx);
@@ -163,8 +163,8 @@ depot_stack_handle_t kmsan_internal_chai
 void kmsan_internal_task_create(struct task_struct *task);
 
 bool kmsan_metadata_is_contiguous(void *addr, size_t size);
-void kmsan_internal_check_memory(void *addr, size_t size, const void *user_addr,
-				 int reason);
+void kmsan_internal_check_memory(void *addr, size_t size,
+				 const void __user *user_addr, int reason);
 
 struct page *kmsan_vmalloc_to_page_or_null(void *vaddr);
 void kmsan_setup_meta(struct page *page, struct page *shadow,
mm/kmsan/report.c renamed from mm/kmsan/report.c~kmsan-add-missing-__user-tags +1 -1
@@ -148,7 +148,7 @@ void kmsan_print_origin(depot_stack_hand
 }
 
 void kmsan_report(depot_stack_handle_t origin, void *address, int size,
-		  int off_first, int off_last, const void *user_addr,
+		  int off_first, int off_last, const void __user *user_addr,
 		  enum kmsan_bug_reason reason)
 {
 	unsigned long stack_entries[KMSAN_STACK_DEPTH];

_

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