From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 20 Oct 2004 11:04:51 +0000 (+0000)
Subject: Updated to fedora-glibc-20041020T1016
X-Git-Tag: cvs/fedora-glibc-2_3_3-71~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c07cf2c35353b15a04e7bcedfb4df8ee194a2ae2;p=thirdparty%2Fglibc.git

Updated to fedora-glibc-20041020T1016
---

diff --git a/ChangeLog b/ChangeLog
index 35e9f5b8059..75e73e79472 100644
--- 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 ce5321bcef4..3db90023bf6 100644
--- 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);