aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/xmknod.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/xmknod.c')
-rw-r--r--sysdeps/unix/sysv/linux/xmknod.c9
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)