AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove bp-semctl.h and CHECK_SEMCTL.

Browse Source
This commit is contained in:
Joseph Myers 2013-01-31 22:59:04 +00:00
parent c2d549290d
commit 2e8a5c8c46
10 changed files with 44 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,5 +1,23 @@
2013-01-31 Joseph Myers <joseph@codesourcery.com> 2013-01-31 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* sysdeps/generic/bp-semctl.h: Remove file.
* sysdeps/unix/sysv/linux/i386/semctl.c: Don't include
<bp-checks.h> and <bp-semctl.h>.
(__old_semctl): Don't use CHECK_SEMCTL.
(__new_semctl): Likewise.
* sysdeps/unix/sysv/linux/semctl.c: Don't include <bp-checks.h>
and <bp-semctl.h>.
(__old_semctl): Don't use CHECK_SEMCTL.
(__new_semctl): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c: Don't include
<bp-checks.h> and <bp-semctl.h>.
(__old_semctl): Don't use CHECK_SEMCTL.
(__new_semctl): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c: Don't include
<bp-checks.h> and <bp-semctl.h>.
(semctl): Don't use CHECK_SEMCTL.
[BZ #13550] [BZ #13550]
* Makerules (elide-bp-thunks): Remove variable. * Makerules (elide-bp-thunks): Remove variable.
(elide-routines.oS): Don't use $(elide-bp-thunks). (elide-routines.oS): Don't use $(elide-bp-thunks).

7
ports/ChangeLog.alpha
View File

@ -1,3 +1,10 @@
2013-01-31 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* sysdeps/unix/sysv/linux/alpha/semctl.c: Don't include
<bp-checks.h> and <bp-semctl.h>.
(__new_semctl): Don't use CHECK_SEMCTL.
2013-01-08 Andreas Jaeger <aj@suse.de> 2013-01-08 Andreas Jaeger <aj@suse.de>
[BZ# 14985] [BZ# 14985]

7
ports/ChangeLog.mips
View File

@ -1,3 +1,10 @@
2013-01-31 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
* sysdeps/unix/sysv/linux/mips/mips64/semctl.c: Don't include
<bp-checks.h> and <bp-semctl.h>.
(__semctl): Don't use CHECK_SEMCTL.
2013-01-29 Maciej W. Rozycki <macro@codesourcery.com> 2013-01-29 Maciej W. Rozycki <macro@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Correct * sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Correct

6
ports/sysdeps/unix/sysv/linux/alpha/semctl.c
View File

@ -33,10 +33,6 @@ union semun
struct seminfo *__buf; /* buffer for IPC_INFO */ struct seminfo *__buf; /* buffer for IPC_INFO */
}; };
#include <bp-checks.h>
#include <bp-semctl.h>
int int
__new_semctl (int semid, int semnum, int cmd, ...) __new_semctl (int semid, int semnum, int cmd, ...)
{ {
@ -51,7 +47,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
va_end (ap); va_end (ap);
return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64, return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64,
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)->array); arg.array);
} }
#include <shlib-compat.h> #include <shlib-compat.h>

5
ports/sysdeps/unix/sysv/linux/mips/mips64/semctl.c
View File

@ -30,9 +30,6 @@ union semun
struct seminfo *__buf; /* buffer for IPC_INFO */ struct seminfo *__buf; /* buffer for IPC_INFO */
}; };
#include <bp-checks.h>
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
int __semctl (int semid, int semnum, int cmd, ...); int __semctl (int semid, int semnum, int cmd, ...);
int int
@ -49,7 +46,7 @@ __semctl (int semid, int semnum, int cmd, ...)
va_end (ap); va_end (ap);
return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64, return INLINE_SYSCALL (semctl, 4, semid, semnum, cmd | __IPC_64,
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)->array); arg.array);
} }
#include <shlib-compat.h> #include <shlib-compat.h>

66
sysdeps/generic/bp-semctl.h
View File

@ -1,66 +0,0 @@
/* Bounded-pointer checking macros for C.
Copyright (C) 2000-2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Greg McGary <greg@mcgary.org>
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
<http://www.gnu.org/licenses/>. */
#ifndef _bp_semctl_h_
#define _bp_semctl_h_ 1
#if __BOUNDED_POINTERS__
# define CHECK_SEMCTL(ARGP, SEMID, CMD) check_semctl (ARGP, SEMID, CMD)
union semun *__unbounded
check_semctl (union semun *arg, int semid, int cmd)
{
int ipc64 = (cmd & __IPC_64);
switch (cmd & ~__IPC_64)
{
case IPC_STAT:
case IPC_SET:
(void) CHECK_1 (arg->buf);
break;
case GETALL:
case SETALL:
{
struct semid_ds ds;
union semun un = { .buf = &ds };
unsigned int length = ~0;
/* It's unfortunate that we need to make a recursive
system call to get the size of the semaphore set... */
if (semctl (semid, 0, IPC_STAT | ipc64, un) == 0)
length = ds.sem_nsems;
(void) CHECK_N (arg->array, length);
break;
}
case IPC_INFO:
(void) CHECK_1 (arg->__buf);
break;
}
return __ptrvalue (arg);
}
#else
# define CHECK_SEMCTL(ARGP, SEMID, CMD) (ARGP)
#endif
#endif /* _bp_semctl_h_ */

7
sysdeps/unix/sysv/linux/i386/semctl.c
View File

@ -49,9 +49,6 @@ union semun
struct __old_semid_ds *__old_buf; struct __old_semid_ds *__old_buf;
}; };
#include <bp-checks.h>
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
/* Return identifier for array of NSEMS semaphores associated with /* Return identifier for array of NSEMS semaphores associated with
KEY. */ KEY. */
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
@ -75,7 +72,7 @@ __old_semctl (int semid, int semnum, int cmd, ...)
va_end (ap); va_end (ap);
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
CHECK_SEMCTL (&arg, semid, cmd)); &arg);
} }
compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0);
#endif #endif
@ -94,7 +91,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
va_end (ap); va_end (ap);
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); &arg);
} }
versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2); versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2);

13
sysdeps/unix/sysv/linux/semctl.c
View File

@ -50,9 +50,6 @@ union semun
struct __old_semid_ds *__old_buf; struct __old_semid_ds *__old_buf;
}; };
#include <bp-checks.h>
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
/* Return identifier for array of NSEMS semaphores associated with /* Return identifier for array of NSEMS semaphores associated with
KEY. */ KEY. */
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
@ -91,7 +88,7 @@ __old_semctl (int semid, int semnum, int cmd, ...)
va_end (ap); va_end (ap);
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
CHECK_SEMCTL (&arg, semid, cmd)); &arg);
} }
compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0);
#endif #endif
@ -126,7 +123,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
#if __ASSUME_IPC64 > 0 #if __ASSUME_IPC64 > 0
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); &arg);
#else #else
switch (cmd) switch (cmd)
{ {
@ -136,7 +133,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
break; break;
default: default:
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
CHECK_SEMCTL (&arg, semid, cmd)); &arg);
} }
{ {
@ -147,7 +144,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
/* Unfortunately there is no way how to find out for sure whether /* Unfortunately there is no way how to find out for sure whether
we should use old or new semctl. */ we should use old or new semctl. */
result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); &arg);
if (result != -1 || errno != EINVAL) if (result != -1 || errno != EINVAL)
return result; return result;
@ -167,7 +164,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
} }
} }
result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, result = INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
CHECK_SEMCTL (&arg, semid, cmd)); &arg);
if (result != -1 && cmd != IPC_SET) if (result != -1 && cmd != IPC_SET)
{ {
memset(buf, 0, sizeof(*buf)); memset(buf, 0, sizeof(*buf));

7
sysdeps/unix/sysv/linux/sparc/sparc32/semctl.c
View File

@ -50,9 +50,6 @@ union semun
struct __old_semid_ds *__old_buf; struct __old_semid_ds *__old_buf;
}; };
#include <bp-checks.h>
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
/* Return identifier for array of NSEMS semaphores associated with /* Return identifier for array of NSEMS semaphores associated with
KEY. */ KEY. */
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
@ -87,7 +84,7 @@ __old_semctl (int semid, int semnum, int cmd, ...)
} }
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
CHECK_SEMCTL (&arg, semid, cmd)); &arg);
} }
compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0); compat_symbol (libc, __old_semctl, semctl, GLIBC_2_0);
#endif #endif
@ -117,7 +114,7 @@ __new_semctl (int semid, int semnum, int cmd, ...)
} }
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
CHECK_SEMCTL (&arg, semid, cmd | __IPC_64)); &arg);
} }
versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2); versioned_symbol (libc, __new_semctl, semctl, GLIBC_2_2);

5
sysdeps/unix/sysv/linux/sparc/sparc64/semctl.c
View File

@ -33,9 +33,6 @@ union semun
struct seminfo *__buf; /* buffer for IPC_INFO */ struct seminfo *__buf; /* buffer for IPC_INFO */
}; };
#include <bp-checks.h>
#include <bp-semctl.h> /* definition of CHECK_SEMCTL needs union semum */
/* Return identifier for array of NSEMS semaphores associated with /* Return identifier for array of NSEMS semaphores associated with
KEY. */ KEY. */
@ -53,5 +50,5 @@ semctl (int semid, int semnum, int cmd, ...)
va_end (ap); va_end (ap);
return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd, return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
CHECK_SEMCTL (&arg, semid, cmd)->array); arg.array);
} }