Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdd33961 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

amd64: fix get_user() on bitwise 



We really need force-cast when converting to final result type;
unsigned long can be silently converted to integer types and
to pointers, but not to bitwise.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c47ffe3d

include/asm-x86_64/uaccess.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -100,7 +100,7 @@ struct exception_table_entry 
	case 8:  __get_user_x(8,__ret_gu,__val_gu,ptr); break;		\

	case 8:  __get_user_x(8,__ret_gu,__val_gu,ptr); break;		\

	default: __get_user_bad(); break;				\

	default: __get_user_bad(); break;				\

	}								\

	}								\

	(x) = (typeof(*(ptr)))__val_gu;				\

	(x) = (__force typeof(*(ptr)))__val_gu;				\

	__ret_gu;							\

	__ret_gu;							\

})

})
@@ -192,7 +192,7 @@ struct __large_struct { unsigned long buf[100]; }; 
	int __gu_err;						\

	int __gu_err;						\

	unsigned long __gu_val;					\

	unsigned long __gu_val;					\

	__get_user_size(__gu_val,(ptr),(size),__gu_err);	\

	__get_user_size(__gu_val,(ptr),(size),__gu_err);	\

	(x) = (typeof(*(ptr)))__gu_val;			\

	(x) = (__force typeof(*(ptr)))__gu_val;			\

	__gu_err;						\

	__gu_err;						\

})

})