diff options
| author | Simona Vetter <simona.vetter@ffwll.ch> | 2026-03-11 11:09:21 +0100 |
|---|---|---|
| committer | Simona Vetter <simona.vetter@ffwll.ch> | 2026-03-11 11:18:31 +0100 |
| commit | 58351f46de26bcc4403f9972f7aed430d15cbd03 (patch) | |
| tree | 1fee527a7026a068b24ece9d4ef1d0ef82e6ca1a /include/linux/eventpoll.h | |
| parent | 5f0a63f81a027becb06a71406e0941c5d12e074d (diff) | |
| parent | 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681 (diff) | |
| download | lwn-58351f46de26bcc4403f9972f7aed430d15cbd03.tar.gz lwn-58351f46de26bcc4403f9972f7aed430d15cbd03.zip | |
Merge v7.0-rc3 into drm-next
Requested by Maxime Ripard for drm-misc-next because renesas people need
fb797a70108f ("drm: renesas: rz-du: mipi_dsi: Set DSI divider").
Signed-off-by: Simona Vetter <simona.vetter@ffwll.ch>
Diffstat (limited to 'include/linux/eventpoll.h')
| -rw-r--r-- | include/linux/eventpoll.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h index ccb478eb174b..ea9ca0e4172a 100644 --- a/include/linux/eventpoll.h +++ b/include/linux/eventpoll.h @@ -82,11 +82,14 @@ static inline struct epoll_event __user * epoll_put_uevent(__poll_t revents, __u64 data, struct epoll_event __user *uevent) { - if (__put_user(revents, &uevent->events) || - __put_user(data, &uevent->data)) - return NULL; - + scoped_user_write_access_size(uevent, sizeof(*uevent), efault) { + unsafe_put_user(revents, &uevent->events, efault); + unsafe_put_user(data, &uevent->data, efault); + } return uevent+1; + +efault: + return NULL; } #endif |