: Fix movq immediate operand constraints in uaccess_64.h
PATCH 1/1 : Fix movq immediate operand constraints in uaccess_64.h
Hello!
arch/x86/include/asm/uaccess_64.h uses wrong asm operand constraint ("ir") for movq insn. Since movq sign-extends its immediate operand, "er" constraint should be used instead.
Attached patch changes all uses of __put_user_asm in uaccess_64.h to use "er" when "q" insn suffix is involved.
Patch was compile tested on x86_64 with defconfig.
Uros.
arch/x86/include/asm/uaccess_64.h +5 -5
@@ -88,11 +88,11 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size) ret, "l", "k", "ir", 4);return ret;case 8 :__put_user_asm (*(u64 *)src, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,8 ); + ret,"q" ,"" ,"er" ,8 );return ret;case 10 :__put_user_asm (*(u64 *)src, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,10 ); + ret,"q" ,"" ,"er" ,10 );if (unlikely (ret))return ret; asm("" :::"memory" );
@@ -101,12 +101,12 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size)return ret;case 16 :__put_user_asm (*(u64 *)src, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,16 ); + ret,"q" ,"" ,"er" ,16 );if (unlikely (ret))return ret; asm("" :::"memory" );__put_user_asm (1 [(u64 *)src],1 + (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,8 ); + ret,"q" ,"" ,"er" ,8 );return ret;default :return copy_user_generic ((__force void *)dst, src, size);
@@ -157,7 +157,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) ret, "q", "", "=r", 8);if (likely (!ret))__put_user_asm (tmp, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,8 ); + ret,"q" ,"" ,"er" ,8 );return ret; }default :
Quoted 9 lines · Uros Bizjak
Hello!
arch/x86/include/asm/uaccess_64.huses wrong asm operand constraint ("ir") for movq insn. Since movq sign-extends its immediate operand, "er" constraint should be used instead.Attached patch changes all uses of
__put_user_asminuaccess_64.hto use "er" when "q" insn suffix is involved.Patch was compile tested on
x86_64with defconfig.Uros.
Uh, missed signed-off line and Cc, so:
arch/x86/include/asm/uaccess_64.h +5 -5
@@ -88,11 +88,11 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size) ret, "l", "k", "ir", 4);return ret;case 8 :__put_user_asm (*(u64 *)src, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,8 ); + ret,"q" ,"" ,"er" ,8 );return ret;case 10 :__put_user_asm (*(u64 *)src, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,10 ); + ret,"q" ,"" ,"er" ,10 );if (unlikely (ret))return ret; asm("" :::"memory" );
@@ -101,12 +101,12 @@ int __copy_to_user(void __user *dst, const void *src, unsigned size)return ret;case 16 :__put_user_asm (*(u64 *)src, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,16 ); + ret,"q" ,"" ,"er" ,16 );if (unlikely (ret))return ret; asm("" :::"memory" );__put_user_asm (1 [(u64 *)src],1 + (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,8 ); + ret,"q" ,"" ,"er" ,8 );return ret;default :return copy_user_generic ((__force void *)dst, src, size);
@@ -157,7 +157,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size) ret, "q", "", "=r", 8);if (likely (!ret))__put_user_asm (tmp, (u64 __user *)dst, - ret,"q" ,"" ,"ir" ,8 ); + ret,"q" ,"" ,"er" ,8 );return ret; }default :
Quoted 7 lines · Uros Bizjak
Quoted 6 lines · Uros Bizjak
Hello!
arch/x86/include/asm/uaccess_64.huses wrong asm operand constraint ("ir") for movq insn. Since movq sign-extends its immediate operand, "er" constraint should be used instead.
Quoted 9 lines
Quoted 6 lines
Attached patch changes all uses of
__put_user_asminuaccess_64.hto use "er" when "q" insn suffix is involved.Patch was compile tested on
x86_64with defconfig.Uros.
Uh, missed signed-off line and Cc, so:
Good catch. This seems to also apply to the "Zr" constraints in asm/uaccess.h.
-hpa