mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
Update.
* nscd/Makefile: Add rules to build nscd as a PIE. 2003-09-23 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/sys/alpha/sysmacros.h: Removed. * sysdeps/unix/sysv/linux/sys/sparc/sysmacros.h: Removed. * sysdeps/unix/sysv/linux/ustat.c (ustat): Adjust for 32-bit kernel dev_t. * sysdeps/unix/sysv/linux/alpha/ustat.c: Removed. * sysdeps/unix/sysv/linux/xmknod.c (__xmknod): Likewise. * sysdeps/unix/sysv/linux/alpha/xmknod.c: Removed. Code by Alexander Viro <aviro@redhat.com>.
This commit is contained in:
@ -33,7 +33,7 @@
|
||||
int
|
||||
__xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
|
||||
{
|
||||
unsigned short int k_dev;
|
||||
unsigned long long int k_dev;
|
||||
|
||||
if (vers != _MKNOD_VER)
|
||||
{
|
||||
@ -42,9 +42,12 @@ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
|
||||
}
|
||||
|
||||
/* We must convert the value to dev_t type used by the kernel. */
|
||||
k_dev = ((major (*dev) & 0xff) << 8) | (minor (*dev) & 0xff);
|
||||
k_dev = (*dev) & ((1ULL << 32) - 1);
|
||||
if (k_dev != *dev)
|
||||
return EOVERFLOW;
|
||||
|
||||
return INLINE_SYSCALL (mknod, 3, CHECK_STRING (path), mode, k_dev);
|
||||
return INLINE_SYSCALL (mknod, 3, CHECK_STRING (path), mode,
|
||||
(unsigned int) k_dev);
|
||||
}
|
||||
|
||||
weak_alias (__xmknod, _xmknod)
|
||||
|
Reference in New Issue
Block a user