mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-03-20 01:22:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

work around broken kernel struct ipc_perm on some big endian archs

Browse Source 
the mode member of struct ipc_perm is specified by POSIX to have type
mode_t, which is uniformly defined as unsigned int. however, Linux
defines it with type __kernel_mode_t, and defines __kernel_mode_t as
unsigned short on some archs. since there is a subsequent padding
field, treating it as a 32-bit unsigned int works on little endian
archs, but the order is backwards on big endian archs with the
erroneous definition.

since multiple archs are affected, remedy the situation with fixup
code in the affected functions (shmctl, semctl, and msgctl) rather
than repeating the same shims in syscall_arch.h for every affected
arch.
This commit is contained in:
Rich Felker 2018-06-20 00:07:09 -04:00
parent 7ea235b1be
commit 0cd2be2314
7 changed files with 85 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/syscall_arch.h
View File

@ -103,3 +103,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
#define VDSO_CGT_VER "LINUX_2.6"
#define SYSCALL_FADVISE_6_ARG
#define SYSCALL_IPC_BROKEN_MODE

1
arch/m68k/syscall_arch.h
View File

@ -88,3 +88,4 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
}
#define SYSCALL_USE_SOCKETCALL
#define SYSCALL_IPC_BROKEN_MODE

2
arch/microblaze/syscall_arch.h
View File

@ -102,3 +102,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
#define SYSCALL_NO_INLINE
#endif
#define SYSCALL_IPC_BROKEN_MODE

2
arch/sh/syscall_arch.h
View File

@ -86,3 +86,5 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
register long r1 __asm__("r1") = f;
__asm_syscall(22, "r"(r3), "r"(r4), "r"(r5), "r"(r6), "r"(r7), "0"(r0), "r"(r1));
}
#define SYSCALL_IPC_BROKEN_MODE

30
src/ipc/msgctl.c
View File

@ -1,12 +1,34 @@
#include <sys/msg.h>
#include <endian.h>
#include "syscall.h"
#include "ipc.h"
#if __BYTE_ORDER != __BIG_ENDIAN
#undef SYSCALL_IPC_BROKEN_MODE
#endif
int msgctl(int q, int cmd, struct msqid_ds *buf)
{
#ifdef SYS_msgctl
return syscall(SYS_msgctl, q, cmd | IPC_64, buf);
#else
return syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0);
#ifdef SYSCALL_IPC_BROKEN_MODE
struct msqid_ds tmp;
if (cmd == IPC_SET) {
tmp = *buf;
tmp.msg_perm.mode *= 0x10000U;
buf = &tmp;
}
#endif
#ifdef SYS_msgctl
int r = __syscall(SYS_msgctl, q, cmd | IPC_64, buf);
#else
int r = __syscall(SYS_ipc, IPCOP_msgctl, q, cmd | IPC_64, 0, buf, 0);
#endif
#ifdef SYSCALL_IPC_BROKEN_MODE
if (r >= 0) switch (cmd) {
case IPC_STAT:
case MSG_STAT:
case MSG_STAT_ANY:
buf->msg_perm.mode >>= 16;
}
#endif
return __syscall_ret(r);
}

30
src/ipc/semctl.c
View File

@ -1,8 +1,13 @@
#include <sys/sem.h>
#include <stdarg.h>
#include <endian.h>
#include "syscall.h"
#include "ipc.h"
#if __BYTE_ORDER != __BIG_ENDIAN
#undef SYSCALL_IPC_BROKEN_MODE
#endif
union semun {
int val;
struct semid_ds *buf;
@ -20,9 +25,26 @@ int semctl(int id, int num, int 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
return syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf);
#ifdef SYSCALL_IPC_BROKEN_MODE
struct semid_ds tmp;
if (cmd == IPC_SET) {
tmp = *arg.buf;
tmp.sem_perm.mode *= 0x10000U;
arg.buf = &tmp;
}
#endif
#ifdef SYS_semctl
int r = __syscall(SYS_semctl, id, num, cmd | IPC_64, arg.buf);
#else
int r = __syscall(SYS_ipc, IPCOP_semctl, id, num, cmd | IPC_64, &arg.buf);
#endif
#ifdef SYSCALL_IPC_BROKEN_MODE
if (r >= 0) switch (cmd) {
case IPC_STAT:
case SEM_STAT:
case SEM_STAT_ANY:
arg.buf->sem_perm.mode >>= 16;
}
#endif
return __syscall_ret(r);
}

30
src/ipc/shmctl.c
View File

@ -1,12 +1,34 @@
#include <sys/shm.h>
#include <endian.h>
#include "syscall.h"
#include "ipc.h"
#if __BYTE_ORDER != __BIG_ENDIAN
#undef SYSCALL_IPC_BROKEN_MODE
#endif
int shmctl(int id, int cmd, struct shmid_ds *buf)
{
#ifdef SYS_shmctl
return syscall(SYS_shmctl, id, cmd | IPC_64, buf);
#else
return syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0);
#ifdef SYSCALL_IPC_BROKEN_MODE
struct shmid_ds tmp;
if (cmd == IPC_SET) {
tmp = *buf;
tmp.shm_perm.mode *= 0x10000U;
buf = &tmp;
}
#endif
#ifdef SYS_shmctl
int r = __syscall(SYS_shmctl, id, cmd | IPC_64, buf);
#else
int r = __syscall(SYS_ipc, IPCOP_shmctl, id, cmd | IPC_64, 0, buf, 0);
#endif
#ifdef SYSCALL_IPC_BROKEN_MODE
if (r >= 0) switch (cmd) {
case IPC_STAT:
case SHM_STAT:
case SHM_STAT_ANY:
buf->shm_perm.mode >>= 16;
}
#endif
return __syscall_ret(r);
}