diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-09-24 06:12:33 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-09-24 06:12:33 +0000 |
| commit | df244a7b4dc2429e5db8f5bded0d9b9c9631285b (patch) | |
| tree | 747ec8003375aba3b953a79c58b3c101f68b2c6f /sysdeps/unix/sysv/linux/xmknod.c | |
| parent | 9a276f8e1e25b558e893e34f9ae6d64130f87cf6 (diff) | |
| download | glibc-df244a7b4dc2429e5db8f5bded0d9b9c9631285b.tar.gz glibc-df244a7b4dc2429e5db8f5bded0d9b9c9631285b.tar.xz glibc-df244a7b4dc2429e5db8f5bded0d9b9c9631285b.zip | |
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>.
Diffstat (limited to 'sysdeps/unix/sysv/linux/xmknod.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/xmknod.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c index 210c55e943..4c5b1f42a4 100644 --- a/sysdeps/unix/sysv/linux/xmknod.c +++ b/sysdeps/unix/sysv/linux/xmknod.c @@ -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) |