From 2b47a7aff24bbfbe7ba89fc6d542acc9f5493ae2 Mon Sep 17 00:00:00 2001 From: rofl0r Date: Thu, 13 Mar 2014 20:27:55 +0100 Subject: semctl: fix UB causing crashes on powerpc it's UB to fetch variadic args when none are passed, and this caused real crashes on ppc due to its calling convention, which defines that for variadic functions aggregate types be passed as pointers. the assignment caused that pointer to get dereferenced, resulting in a crash. --- src/ipc/semctl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/ipc') diff --git a/src/ipc/semctl.c b/src/ipc/semctl.c index 3d79f503..673a9a8c 100644 --- a/src/ipc/semctl.c +++ b/src/ipc/semctl.c @@ -11,11 +11,15 @@ union semun { int semctl(int id, int num, int cmd, ...) { - union semun arg; + union semun arg = {0}; va_list ap; - va_start(ap, cmd); - arg = va_arg(ap, union semun); - va_end(ap); + switch (cmd) { + case SETVAL: case GETALL: case SETALL: case IPC_STAT: case IPC_SET: + case IPC_INFO: case SEM_INFO: case SEM_STAT: + va_start(ap, cmd); + arg = va_arg(ap, union semun); + va_end(ap); + } #ifdef SYS_semctl return syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf); #else -- cgit v1.2.1