This is the mail archive of the
libc-alpha@sourceware.cygnus.com
mailing list for the glibc project.
Re: 32bit UID support for glibc 2.1.3
>>>>> Ulrich Drepper writes:
UD> Andreas Jaeger <aj@suse.de> writes:
>> I'm appending a "clean" patch to implement my proposal. I check for
>> overflow in just two places: st_size and st_blocks. Both can be
>> larger than 32bit - in reality.
UD> These are indeed the only values which can overflow.
>> I'm just appending a patch for xstat for i386. If you agree that this
>> is the right solution, I'll do the rest. Please give me your feedback.
UD> I've applied the patch. Please provide the rest of the patches when
UD> you're finished. Thanks,
I'm appending the patches.
Please note that I'm not setting and saving errno anymore. I've had a
private discussion with Andreas Schwab and we agreed that we don't
need to restore errno for these calls.
I've also fixed xstat, the _STAT_VER_KERNEL handling in my last patch
was wrong.
Andreas
2000-01-18 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/i386/lxstat.c: New file, handles 32bit
UIDs.
* sysdeps/unix/sysv/linux/i386/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Move
_STAT_VER_KERNEL handling up; don't save errno.
* sysdeps/unix/sysv/linux/arm/fxstat.c: New file.
* sysdeps/unix/sysv/linux/arm/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/arm/xstat.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/m68k/xstat.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/lxstat.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c: Likewise.
============================================================
Index: sysdeps/unix/sysv/linux/i386/xstat.c
--- sysdeps/unix/sysv/linux/i386/xstat.c 2000/01/18 03:12:44 1.1
+++ sysdeps/unix/sysv/linux/i386/xstat.c 2000/01/18 15:42:10
@@ -46,39 +46,34 @@
int
__xstat (int vers, const char *name, struct stat *buf)
{
-#if __ASSUME_STAT64_SYSCALL > 0
struct kernel_stat kbuf;
int result;
+ if (vers == _STAT_VER_KERNEL)
+ {
+ return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf);
+ }
+#if __ASSUME_STAT64_SYSCALL > 0
result = INLINE_SYSCALL (stat64, 2, name, &buf64);
if (result == 0)
result = xstat32_conv (vers, &buf64, buf);
return result;
#else
- struct kernel_stat kbuf;
- int result;
-
- if (vers == _STAT_VER_KERNEL)
- {
- return INLINE_SYSCALL (stat, 2, name, (struct kernel_stat *) buf);
- }
# if defined __NR_stat64
/* To support 32 bit UIDs, we have to use stat64. The normal stat call only returns
16 bit UIDs. */
if (! __have_no_stat64)
{
struct stat64 buf64;
-
- int saved_errno = errno;
+
result = INLINE_SYSCALL (stat64, 2, name, &buf64);
if (result == 0)
result = xstat32_conv (vers, &buf64, buf);
-
+
if (result != -1 || errno != ENOSYS)
return result;
- __set_errno (saved_errno);
__have_no_stat64 = 1;
}
# endif
============================================================
Index: sysdeps/unix/sysv/linux/i386/lxstat.c
--- sysdeps/unix/sysv/linux/i386/lxstat.c created
+++ sysdeps/unix/sysv/linux/i386/lxstat.c Tue Jan 18 15:37:48 2000 1.1
@@ -0,0 +1,94 @@
+/* lxstat using old-style Unix lstat system call.
+ Copyright (C) 1991,95,96,97,98,2000 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
+ will complain since they don't strictly match. */
+#define __lxstat64 __lxstat64_disable
+
+#include <errno.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <kernel_stat.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+#include <xstatconv.c>
+
+extern int __syscall_lstat (const char *, struct kernel_stat *);
+
+#ifdef __NR_stat64
+extern int __syscall_lstat64 (const char *, struct stat64 *);
+# if __ASSUME_STAT64_SYSCALL == 0
+/* The variable is shared between all wrappers around *stat64 calls. */
+extern int __have_no_stat64;
+# endif
+#endif
+
+
+/* Get information about the file NAME in BUF. */
+int
+__lxstat (int vers, const char *name, struct stat *buf)
+{
+ struct kernel_stat kbuf;
+ int result;
+
+ if (vers == _STAT_VER_KERNEL)
+ {
+ return INLINE_SYSCALL (lstat, 2, name, (struct kernel_stat *) buf);
+ }
+
+#if __ASSUME_STAT64_SYSCALL > 0
+ result = INLINE_SYSCALL (lstat64, 2, name, &buf64);
+ if (result == 0)
+ result = xstat32_conv (vers, &buf64, buf);
+ return result;
+#else
+
+# if defined __NR_stat64
+ /* To support 32 bit UIDs, we have to use stat64. The normal stat call only returns
+ 16 bit UIDs. */
+ if (! __have_no_stat64)
+ {
+ struct stat64 buf64;
+ result = INLINE_SYSCALL (lstat64, 2, name, &buf64);
+
+ if (result == 0)
+ result = xstat32_conv (vers, &buf64, buf);
+
+ if (result != -1 || errno != ENOSYS)
+ return result;
+
+ __have_no_stat64 = 1;
+ }
+# endif
+
+ result = INLINE_SYSCALL (lstat, 2, name, &kbuf);
+ if (result == 0)
+ result = xstat_conv (vers, &kbuf, buf);
+
+ return result;
+#endif
+}
+
+weak_alias (__lxstat, _lxstat);
+#ifdef XSTAT_IS_XSTAT64
+#undef __lxstat64
+strong_alias (__lxstat, __lxstat64);
+#endif
============================================================
Index: sysdeps/unix/sysv/linux/i386/fxstat.c
--- sysdeps/unix/sysv/linux/i386/fxstat.c created
+++ sysdeps/unix/sysv/linux/i386/fxstat.c Tue Jan 18 15:39:05 2000 1.1
@@ -0,0 +1,93 @@
+/* fxstat using old-style Unix fstat system call.
+ Copyright (C) 1991,95,96,97,98,2000 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+/* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
+ will complain since they don't strictly match. */
+#define __fxstat64 __fxstat64_disable
+
+#include <errno.h>
+#include <stddef.h>
+#include <sys/stat.h>
+#include <kernel_stat.h>
+
+#include <sysdep.h>
+#include <sys/syscall.h>
+
+#include <xstatconv.c>
+
+extern int __syscall_fstat (int, struct kernel_stat *);
+
+#ifdef __NR_stat64
+extern int __syscall_fstat64 (int, struct stat64 *);
+# if __ASSUME_STAT64_SYSCALL == 0
+/* The variable is shared between all wrappers around *stat64 calls. */
+extern int __have_no_stat64;
+# endif
+#endif
+
+/* Get information about the file FD in BUF. */
+int
+__fxstat (int vers, int fd, struct stat *buf)
+{
+ struct kernel_stat kbuf;
+ int result;
+
+ if (vers == _STAT_VER_KERNEL)
+ {
+ return INLINE_SYSCALL (fstat, 2, fd, (struct kernel_stat *) buf);
+ }
+#if __ASSUME_STAT64_SYSCALL > 0
+ result = INLINE_SYSCALL (fstat64, 2, name, &buf64);
+ if (result == 0)
+ result = xstat32_conv (vers, &buf64, buf);
+ return result;
+#else
+
+# if defined __NR_stat64
+ /* To support 32 bit UIDs, we have to use stat64. The normal stat call only returns
+ 16 bit UIDs. */
+ if (! __have_no_stat64)
+ {
+ struct stat64 buf64;
+
+ result = INLINE_SYSCALL (fstat64, 2, name, &buf64);
+
+ if (result == 0)
+ result = xstat32_conv (vers, &buf64, buf);
+
+ if (result != -1 || errno != ENOSYS)
+ return result;
+
+ __have_no_stat64 = 1;
+ }
+# endif
+
+ result = INLINE_SYSCALL (fstat, 2, fd, &kbuf);
+ if (result == 0)
+ result = xstat_conv (vers, &kbuf, buf);
+
+ return result;
+#endif /* __ASSUME_STAT64_SYSCALL */
+}
+
+weak_alias (__fxstat, _fxstat);
+#ifdef XSTAT_IS_XSTAT64
+#undef __fxstat64
+strong_alias (__fxstat, __fxstat64);
+#endif
============================================================
Index: sysdeps/unix/sysv/linux/arm/fxstat.c
--- sysdeps/unix/sysv/linux/arm/fxstat.c created
+++ sysdeps/unix/sysv/linux/arm/fxstat.c Tue Jan 18 15:50:05 2000 1.1
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
============================================================
Index: sysdeps/unix/sysv/linux/arm/lxstat.c
--- sysdeps/unix/sysv/linux/arm/lxstat.c created
+++ sysdeps/unix/sysv/linux/arm/lxstat.c Tue Jan 18 15:49:58 2000 1.1
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/i386/lxstat.c>
+
============================================================
Index: sysdeps/unix/sysv/linux/arm/xstat.c
--- sysdeps/unix/sysv/linux/arm/xstat.c created
+++ sysdeps/unix/sysv/linux/arm/xstat.c Tue Jan 18 15:49:43 2000 1.1
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/xstat.c>
============================================================
Index: sysdeps/unix/sysv/linux/m68k/fxstat.c
--- sysdeps/unix/sysv/linux/m68k/fxstat.c created
+++ sysdeps/unix/sysv/linux/m68k/fxstat.c Tue Jan 18 15:50:44 2000 1.1
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
============================================================
Index: sysdeps/unix/sysv/linux/m68k/lxstat.c
--- sysdeps/unix/sysv/linux/m68k/lxstat.c created
+++ sysdeps/unix/sysv/linux/m68k/lxstat.c Tue Jan 18 15:50:44 2000 1.1
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/i386/lxstat.c>
+
============================================================
Index: sysdeps/unix/sysv/linux/m68k/xstat.c
--- sysdeps/unix/sysv/linux/m68k/xstat.c created
+++ sysdeps/unix/sysv/linux/m68k/xstat.c Tue Jan 18 15:50:44 2000 1.1
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/xstat.c>
============================================================
Index: sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c
--- sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c created
+++ sysdeps/unix/sysv/linux/sparc/sparc32/fxstat.c Tue Jan 18 15:51:08 2000 1.1
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/fxstat.c>
============================================================
Index: sysdeps/unix/sysv/linux/sparc/sparc32/lxstat.c
--- sysdeps/unix/sysv/linux/sparc/sparc32/lxstat.c created
+++ sysdeps/unix/sysv/linux/sparc/sparc32/lxstat.c Tue Jan 18 15:51:08 2000 1.1
@@ -0,0 +1,2 @@
+#include <sysdeps/unix/sysv/linux/i386/lxstat.c>
+
============================================================
Index: sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c
--- sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c created
+++ sysdeps/unix/sysv/linux/sparc/sparc32/xstat.c Tue Jan 18 15:51:08 2000 1.1
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/xstat.c>
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.rhein-neckar.de