mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 17:50:20 +00:00
720e9541f5
Linux 5.1 adds missing SySV IPC syscalls to the syscall table for remanining one that still uses the ipc syscall on glibc (m68k, mips-o32, powerpc, s390, sh, and sparc32). However the newly added direct ipc syscall are different than the old ones: 1. They do not expect IPC_64, meaning __IPC_64 should be set to zero when new syscalls are used. And new syscalls can not be used for compat functions like __old_semctl (to emulated old sysvipc it requires to use the old __NR_ipc syscall without __IPC_64). Thus IPC_64 is redefined for newer kernels on affected ABIs. 2. semtimedop and semop does not exist on 32-bit ABIs (only semtimedop_time64 is supplied). The provided syscall wrappers only uses the wire-up syscall if __NR_semtimedop and __NR_semop are also defined. Checked on x86_64-linux-gnu and i686-linux-gnu on both a 4.15 kernel configure with default options and sysvipc tests on a 5.3.0 kernel with --enable-kernel=5.1. Tested-by: Paul A. Clarke <pc@us.ibm.com>
184 lines
4.9 KiB
C
184 lines
4.9 KiB
C
/* Copyright (C) 1995-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <sys/sem.h>
|
|
#include <stdarg.h>
|
|
#include <ipc_priv.h>
|
|
#include <sysdep.h>
|
|
#include <shlib-compat.h>
|
|
#include <errno.h>
|
|
|
|
/* Define a `union semun' suitable for Linux here. */
|
|
union semun
|
|
{
|
|
int val; /* value for SETVAL */
|
|
struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */
|
|
unsigned short int *array; /* array for GETALL & SETALL */
|
|
struct seminfo *__buf; /* buffer for IPC_INFO */
|
|
};
|
|
|
|
#ifndef DEFAULT_VERSION
|
|
# ifndef __ASSUME_SYSVIPC_BROKEN_MODE_T
|
|
# define DEFAULT_VERSION GLIBC_2_2
|
|
# else
|
|
# define DEFAULT_VERSION GLIBC_2_31
|
|
# endif
|
|
#endif
|
|
|
|
static int
|
|
semctl_syscall (int semid, int semnum, int cmd, union semun arg)
|
|
{
|
|
#ifdef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
|
|
return INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd | __IPC_64,
|
|
arg.array);
|
|
#else
|
|
return INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
|
|
SEMCTL_ARG_ADDRESS (arg));
|
|
#endif
|
|
}
|
|
|
|
int
|
|
__new_semctl (int semid, int semnum, int cmd, ...)
|
|
{
|
|
/* POSIX states ipc_perm mode should have type of mode_t. */
|
|
_Static_assert (sizeof ((struct semid_ds){0}.sem_perm.mode)
|
|
== sizeof (mode_t),
|
|
"sizeof (msqid_ds.msg_perm.mode) != sizeof (mode_t)");
|
|
|
|
union semun arg = { 0 };
|
|
va_list ap;
|
|
|
|
/* Get the argument only if required. */
|
|
switch (cmd)
|
|
{
|
|
case SETVAL: /* arg.val */
|
|
case GETALL: /* arg.array */
|
|
case SETALL:
|
|
case IPC_STAT: /* arg.buf */
|
|
case IPC_SET:
|
|
case SEM_STAT:
|
|
case IPC_INFO: /* arg.__buf */
|
|
case SEM_INFO:
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, union semun);
|
|
va_end (ap);
|
|
break;
|
|
}
|
|
|
|
#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
|
|
struct semid_ds tmpds;
|
|
if (cmd == IPC_SET)
|
|
{
|
|
tmpds = *arg.buf;
|
|
tmpds.sem_perm.mode *= 0x10000U;
|
|
arg.buf = &tmpds;
|
|
}
|
|
#endif
|
|
|
|
int ret = semctl_syscall (semid, semnum, cmd, arg);
|
|
|
|
#ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
|
|
if (ret >= 0)
|
|
{
|
|
switch (cmd)
|
|
{
|
|
case IPC_STAT:
|
|
case SEM_STAT:
|
|
case SEM_STAT_ANY:
|
|
arg.buf->sem_perm.mode >>= 16;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return ret;
|
|
}
|
|
versioned_symbol (libc, __new_semctl, semctl, DEFAULT_VERSION);
|
|
|
|
#if defined __ASSUME_SYSVIPC_BROKEN_MODE_T \
|
|
&& SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_31)
|
|
int
|
|
attribute_compat_text_section
|
|
__semctl_mode16 (int semid, int semnum, int cmd, ...)
|
|
{
|
|
union semun arg = { 0 };
|
|
va_list ap;
|
|
|
|
/* Get the argument only if required. */
|
|
switch (cmd)
|
|
{
|
|
case SETVAL: /* arg.val */
|
|
case GETALL: /* arg.array */
|
|
case SETALL:
|
|
case IPC_STAT: /* arg.buf */
|
|
case IPC_SET:
|
|
case SEM_STAT:
|
|
case IPC_INFO: /* arg.__buf */
|
|
case SEM_INFO:
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, union semun);
|
|
va_end (ap);
|
|
break;
|
|
}
|
|
|
|
return semctl_syscall (semid, semnum, cmd, arg);
|
|
}
|
|
compat_symbol (libc, __semctl_mode16, semctl, GLIBC_2_2);
|
|
#endif
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
|
|
/* Since semctl use a variadic argument for semid_ds there is not need to
|
|
define and tie the compatibility symbol to the old 'union semun'
|
|
definition. */
|
|
int
|
|
attribute_compat_text_section
|
|
__old_semctl (int semid, int semnum, int cmd, ...)
|
|
{
|
|
union semun arg = { 0 };
|
|
va_list ap;
|
|
|
|
/* Get the argument only if required. */
|
|
switch (cmd)
|
|
{
|
|
case SETVAL: /* arg.val */
|
|
case GETALL: /* arg.array */
|
|
case SETALL:
|
|
case IPC_STAT: /* arg.buf */
|
|
case IPC_SET:
|
|
case SEM_STAT:
|
|
case IPC_INFO: /* arg.__buf */
|
|
case SEM_INFO:
|
|
va_start (ap, cmd);
|
|
arg = va_arg (ap, union semun);
|
|
va_end (ap);
|
|
break;
|
|
}
|
|
|
|
#if defined __ASSUME_DIRECT_SYSVIPC_SYSCALLS \
|
|
&& !defined __ASSUME_SYSVIPC_DEFAULT_IPC_64
|
|
/* For architectures that have wire-up semctl but also have __IPC_64 to a
|
|
value different than default (0x0) it means the compat symbol used the
|
|
__NR_ipc syscall. */
|
|
return INLINE_SYSCALL_CALL (semctl, semid, semnum, cmd, arg.array);
|
|
# else
|
|
return INLINE_SYSCALL_CALL (ipc, IPCOP_semctl, semid, semnum, cmd,
|
|
SEMCTL_ARG_ADDRESS (arg));
|
|
# endif
|
|
}
|
|
compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0);
|
|
#endif
|