Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a4fedc858d6974179b6139536ff385e9fd157153

Authored by Catalin Marinas
Committed by Greg Kroah-Hartman
1 parent 17392a1a49

arm64: compat Fix siginfo_t -> compat_siginfo_t conversion on big endian 

commit 9d42d48a342aee208c1154696196497fdc556bbf upstream.

The native (64-bit) sigval_t union contains sival_int (32-bit) and
sival_ptr (64-bit). When a compat application invokes a syscall that
takes a sigval_t value (as part of a larger structure, e.g.
compat_sys_mq_notify, compat_sys_timer_create), the compat_sigval_t
union is converted to the native sigval_t with sival_int overlapping
with either the least or the most significant half of sival_ptr,
depending on endianness. When the corresponding signal is delivered to a
compat application, on big endian the current (compat_uptr_t)sival_ptr
cast always returns 0 since sival_int corresponds to the top part of
sival_ptr. This patch fixes copy_siginfo_to_user32() so that sival_int
is copied to the compat_siginfo_t structure.

Reported-by: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>
Tested-by: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff

arch/arm64/kernel/signal32.c
Diff comments   View file @ a4fedc8
... ... @@ -154,8 +154,7 @@
154 154 case __SI_TIMER:
155 155 err |= __put_user(from->si_tid, &to->si_tid);
156 156 err |= __put_user(from->si_overrun, &to->si_overrun);
157   - err |= __put_user((compat_uptr_t)(unsigned long)from->si_ptr,
158   - &to->si_ptr);
  157 + err |= __put_user(from->si_int, &to->si_int);
159 158 break;
160 159 case __SI_POLL:
161 160 err |= __put_user(from->si_band, &to->si_band);
... ... @@ -184,7 +183,7 @@
184 183 case __SI_MESGQ: /* But this is */
185 184 err |= __put_user(from->si_pid, &to->si_pid);
186 185 err |= __put_user(from->si_uid, &to->si_uid);
187   - err |= __put_user((compat_uptr_t)(unsigned long)from->si_ptr, &to->si_ptr);
  186 + err |= __put_user(from->si_int, &to->si_int);
188 187 break;
189 188 default: /* this is just in case for now ... */
190 189 err |= __put_user(from->si_pid, &to->si_pid);