From 293c7e46e33936521c293c73900f6e0d1ed43bcc Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 18 Jan 2000 04:30:34 +0000 Subject: [PATCH] (__syscall_chown): Use proper prototype. Don't include non-existant header. (__chown): Return EINVAL if owner or group are out of the range -1U .. 65534. --- sysdeps/unix/sysv/linux/m68k/chown.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sysdeps/unix/sysv/linux/m68k/chown.c b/sysdeps/unix/sysv/linux/m68k/chown.c index c27da95..4e7625c 100644 --- a/sysdeps/unix/sysv/linux/m68k/chown.c +++ b/sysdeps/unix/sysv/linux/m68k/chown.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998 Free Software Foundation, Inc. +/* Copyright (C) 1998, 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 @@ -24,21 +24,28 @@ #include -#include - extern int __syscall_chown (const char *__file, - uid_t __owner, gid_t __group); + __kernel_uid_t __owner, __kernel_gid_t __group); #ifdef __NR_chown32 extern int __syscall_chown32 (const char *__file, __kernel_uid32_t owner, __kernel_gid32_t group); + +# if __ASSUME_32BITUIDS == 0 +/* This variable is shared with all files that need to check for 32bit + uids. */ +extern int __libc_missing_32bit_uids; +# endif #endif /* __NR_chown32 */ int __chown (const char *file, uid_t owner, gid_t group) { -#ifdef __NR_chown32 - if (__libc_missing_32bit_uids != NO_HIGHUIDS) +#if __ASSUME_32BITUIDS + return INLINE_SYSCALL (chown32, 3, file, owner, group); +#else +# ifdef __NR_chown32 + if (!__libc_missing_32bit_uids) { int result; int saved_errno = errno; @@ -48,10 +55,18 @@ __chown (const char *file, uid_t owner, gid_t group) return result; __set_errno (saved_errno); - __libc_missing_32bit_uids = NO_HIGHUIDS; + __libc_missing_32bit_uids = 1; + } +# endif /* __NR_chown32 */ + + if (((owner + 1) > (gid_t) ((__kernel_uid_t) -1U)) + || ((group + 1) > (gid_t) ((__kernel_gid_t) -1U))) + { + __set_errno (EINVAL); + return -1; } -#endif /* __NR_chown32 */ return INLINE_SYSCALL (chown, 3, file, owner, group); +#endif } weak_alias (__chown, chown) -- 2.7.4