History

Clean up x86 unsafe_get/put_user() type handling

Al noticed that unsafe_put_user() had type problems, and fixed them in commit a7cc722fff0b ("fix unsafe_put_user()"), which made me look more at those functions. It turns out that unsafe_get_user() had a type issue too: it limited the largest size of the type it could handle to "unsigned long". Which is fine with the current users, but doesn't match our existing normal get_user() semantics, which can also handle "u64" even when that does not fit in a long. While at it, also clean up the type cast in unsafe_put_user(). We actually want to just make it an assignment to the expected type of the pointer, because we actually do want warnings from types that don't convert silently. And it makes the code more readable by not having that one very long and complex line. [ This patch might become stable material if we ever end up back-porting any new users of the unsafe uaccess code, but as things stand now this doesn't matter for any current existing uses. ]

Linus Torvalds committed 9 years ago

Commit 334a0231 parent f3926e41 file · +3 −2Browse files

Unified · Split

arch/x86/include/asm/uaccess.h+3−2
@@ -703,14 +703,15 @@ extern struct movsl_mask { · 702 unmodified lines
703#define unsafe_put_user(x, ptr, err_label) \703#define unsafe_put_user(x, ptr, err_label) \
704do { \704do { \
705 int __pu_err; \705 int __pu_err; \
706 __put_user_size((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), __pu_err, -EFAULT); \706 __typeof__(*(ptr)) __pu_val = (x); \
707 __put_user_size(__pu_val, (ptr), sizeof(*(ptr)), __pu_err, -EFAULT); \
707 if (unlikely(__pu_err)) goto err_label; \708 if (unlikely(__pu_err)) goto err_label; \
708} while (0)709} while (0)
709 710
710#define unsafe_get_user(x, ptr, err_label) \711#define unsafe_get_user(x, ptr, err_label) \
711do { \712do { \
712 int __gu_err; \713 int __gu_err; \
713 unsigned long __gu_val; \714 __inttype(*(ptr)) __gu_val; \
714 __get_user_size(__gu_val, (ptr), sizeof(*(ptr)), __gu_err, -EFAULT); \715 __get_user_size(__gu_val, (ptr), sizeof(*(ptr)), __gu_err, -EFAULT); \
715 (x) = (__force __typeof__(*(ptr)))__gu_val; \716 (x) = (__force __typeof__(*(ptr)))__gu_val; \
716 if (unlikely(__gu_err)) goto err_label; \717 if (unlikely(__gu_err)) goto err_label; \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t