Updated to fedora-glibc-20041020T1016

diff --git a/ChangeLog b/ChangeLog
index 35e9f5b80592284d1cd474fc70948c778f56b1d4..75e73e79472db1a1b321ddc4e9148f681d22fd95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-20  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): If /proc
+       is not mounted, return 1.
+
 2004-10-20  Roland McGrath  <roland@redhat.com>
 
        * manual/errno.texi (Error Codes): Add ENOKEY, EKEYEXPIRED,

diff --git a/sysdeps/unix/sysv/linux/readonly-area.c b/sysdeps/unix/sysv/linux/readonly-area.c
index ce5321bcef41498444253af875b67cce6fd95c22..3db90023bf6b7f59c12448462aa2b2400057886c 100644 (file)
--- a/sysdeps/unix/sysv/linux/readonly-area.c
+++ b/sysdeps/unix/sysv/linux/readonly-area.c
@@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t size)
 
   FILE *fp = fopen ("/proc/self/maps", "rc");
   if (fp == NULL)
-    return -1;
+    /* 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;
 
   /* We need no locking.  */
   __fsetlocking (fp, FSETLOCKING_BYCALLER);