diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch')
| -rw-r--r-- | 0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch index c5a43608f..0aa663fbf 100644 --- a/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch +++ b/0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch @@ -51,10 +51,10 @@ Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index 98c6b91be4a8..60055827dddc 100644 +index a13d90206472..6a6aae01755b 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h -@@ -191,11 +191,12 @@ extern int __get_user_64t_4(void *); +@@ -195,11 +195,12 @@ extern int __get_user_64t_4(void *); #define __get_user_check(x, p) \ ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ @@ -68,7 +68,7 @@ index 98c6b91be4a8..60055827dddc 100644 switch (sizeof(*(__p))) { \ case 1: \ if (sizeof((x)) >= 8) \ -@@ -223,9 +224,10 @@ extern int __get_user_64t_4(void *); +@@ -227,9 +228,10 @@ extern int __get_user_64t_4(void *); break; \ default: __e = __get_user_bad(); break; \ } \ |