Merge branches 'fixes', 'misc' and 'spectre' into for-linus

[sfrench/cifs-2.6.git] / arch / arm / kernel / sys_oabi-compat.c

diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 1df21a61e379e1a0fe66e784c7a1212814b100da..f0dd4b6ebb6330e5007e883d2ba2d099a4e1df94 100644 (file)
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -329,9 +329,11 @@ asmlinkage long sys_oabi_semtimedop(int semid,
                return -ENOMEM;
        err = 0;
        for (i = 0; i < nsops; i++) {
-               __get_user_error(sops[i].sem_num, &tsops->sem_num, err);
-               __get_user_error(sops[i].sem_op,  &tsops->sem_op,  err);
-               __get_user_error(sops[i].sem_flg, &tsops->sem_flg, err);
+               struct oabi_sembuf osb;
+               err |= __copy_from_user(&osb, tsops, sizeof(osb));
+               sops[i].sem_num = osb.sem_num;
+               sops[i].sem_op = osb.sem_op;
+               sops[i].sem_flg = osb.sem_flg;
                tsops++;
        }
        if (timeout) {