x86-uaccess-instrument-copy_from_user_nmi.patch removed from -mm tree
The quilt patch titled
Subject: x86/uaccess: instrument copy_from_user_nmi()
has been removed from the -mm tree. Its filename was
x86-uaccess-instrument-copy_from_user_nmi.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Alexander Potapenko <[email protected]>
Subject: x86/uaccess: instrument copy_from_user_nmi()
Date: Wed, 2 Nov 2022 12:06:08 +0100
Make sure usercopy hooks from linux/instrumented.h are invoked for copy_from_user_nmi(). This fixes KMSAN false positives reported when dumping opcodes for a stack trace.
---
arch/x86/lib/usercopy.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/lib/usercopy.c renamed from arch/x86/lib/usercopy.c~x86-uaccess-instrument-copy_from_user_nmi +3 -0
@@ -6,6 +6,7 @@#include <linux/uaccess.h> #include <linux/export.h> +#include <linux/instrumented.h> #include <asm/tlbflush.h>
@@ -44,7 +45,9 @@ copy_from_user_nmi(void *to, const void* called from other contexts. */ pagefault_disable (); +instrument_copy_from_user_before (to, from, n); ret =raw_copy_from_user (to, from, n); +instrument_copy_from_user_after (to, from, n, ret);pagefault_enable ();return ret;
_
Patches currently in -mm which might be from [email protected] are