diff options
| author | Julien Thierry <julien.thierry@arm.com> | 2019-01-09 12:53:09 -0500 |
|---|---|---|
| committer | David A. Long <dave.long@linaro.org> | 2019-02-13 12:14:33 -0500 |
| commit | b78b95d311c390c39c9c3271fcd3060fbc416206 (patch) | |
| tree | ae933aa819b0fdd04b084efbc2e83f0713900bfd | |
| parent | 984a3991d07e53553804c91c1980c45e305d733b (diff) | |
| download | linux-linaro-stable-b78b95d311c390c39c9c3271fcd3060fbc416206.tar.gz | |
ARM: 8792/1: oabi-compat: copy oabi events using __copy_to_user()
Commit 319508902600c2688e057750148487996396e9ca upstream.
Copy events to user using __copy_to_user() rather than copy members of
individually with __put_user_error().
This has the benefit of disabling/enabling PAN once per event intead of
once per event member.
Signed-off-by: Julien Thierry <julien.thierry@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David A. Long <dave.long@linaro.org>
| -rw-r--r-- | arch/arm/kernel/sys_oabi-compat.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c index f0dd4b6ebb63..40da0872170f 100644 --- a/arch/arm/kernel/sys_oabi-compat.c +++ b/arch/arm/kernel/sys_oabi-compat.c @@ -277,6 +277,7 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, int maxevents, int timeout) { struct epoll_event *kbuf; + struct oabi_epoll_event e; mm_segment_t fs; long ret, err, i; @@ -295,8 +296,11 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, set_fs(fs); err = 0; for (i = 0; i < ret; i++) { - __put_user_error(kbuf[i].events, &events->events, err); - __put_user_error(kbuf[i].data, &events->data, err); + e.events = kbuf[i].events; + e.data = kbuf[i].data; + err = __copy_to_user(events, &e, sizeof(e)); + if (err) + break; events++; } kfree(kbuf); |