diff options
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/ldsodefs.h | 6 | ||||
-rw-r--r-- | sysdeps/generic/tst-audit.h | 11 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/readonly-area.c | 15 |
3 files changed, 27 insertions, 5 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 191ae4d4fb..b8333ed79c 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -292,6 +292,9 @@ struct audit_ifaces const struct La_sparc64_regs *, unsigned int *, const char *name, long int *framesizep); +#ifdef ARCH_PLTENTER_MEMBERS + ARCH_PLTENTER_MEMBERS; +#endif }; union { @@ -360,6 +363,9 @@ struct audit_ifaces const struct La_sparc32_regs *, struct La_sparc32_retval *, const char *); +#ifdef ARCH_PLTEXIT_MEMBERS + ARCH_PLTEXIT_MEMBERS; +#endif }; unsigned int (*objclose) (uintptr_t *); diff --git a/sysdeps/generic/tst-audit.h b/sysdeps/generic/tst-audit.h new file mode 100644 index 0000000000..402e7c0665 --- /dev/null +++ b/sysdeps/generic/tst-audit.h @@ -0,0 +1,11 @@ +/* Some machines have these macros defined in elf/tst-auditmod1.c directly. + New machines can supply a tst-audit.h to define these macros used there. + + +# define pltenter la_CPU_gnu_pltenter +# define pltexit la_CPU_gnu_pltexit +# define La_regs La_CPU_regs +# define La_retval La_CPU_retval +# define int_retval lrv_RETVALREG + +*/ diff --git a/sysdeps/unix/sysv/linux/readonly-area.c b/sysdeps/unix/sysv/linux/readonly-area.c index 3db90023bf..29224d98b9 100644 --- a/sysdeps/unix/sysv/linux/readonly-area.c +++ b/sysdeps/unix/sysv/linux/readonly-area.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004 Free Software Foundation, Inc. +/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,6 +16,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <errno.h> #include <stdint.h> #include <stdio.h> #include <stdio_ext.h> @@ -33,10 +34,14 @@ __readonly_area (const char *ptr, size_t size) FILE *fp = fopen ("/proc/self/maps", "rc"); if (fp == NULL) - /* We don't know. Returning 1 here means that programs using %n - and -D_FORTIFY_SOURCE=2 will work even when /proc is not mounted, - but will allow %n even in writable areas. */ - return 1; + { + if (errno == ENOENT) + /* It is the system administrator's choice to not have /proc + available to this process (e.g., because it runs in a chroot + environment. Don't fail in this case. */ + return 1; + return -1; + } /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); |