diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
commit | 5ec75f810f09a224ce0f77ba312599eb4c7321bc (patch) | |
tree | dcb2b1a0d97363e1a678726925d875c1bea151fa /0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch | |
parent | 11a8f14639c96c38e142ba04c87f50de9c557ba7 (diff) | |
parent | a71ee103a729754519abc15fd58e6b258a89e58b (diff) | |
download | kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.gz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.xz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.zip |
merge origin
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 | 8 |
1 files changed, 4 insertions, 4 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..283ac06f1 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 b5fdd30252f8..d43ceaa78269 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; \ } \ @@ -82,5 +82,5 @@ index 98c6b91be4a8..60055827dddc 100644 #define get_user(x, p) \ -- -2.26.2 +2.28.0 |