Source: klibc
Version: 2.0.2
Severity: important
Tags: Patch
On the hppa arch (32bit userspace and 32 or 64bit kernel), the fstype program
fails to detect the filesystem.
The reason for this failure is, that fstype calls the pread() syscall, which
has on some architectures with 32bit userspace a different calling syntax.
I noticed this bug on hppa, but I assume s390 (32bit) and others might run into
similiar issues.
The attached bug fixes it for the hppa architecture.
It would be nice if you could apply it.
Thanks,
Helge
Patch: Add pread and pwrite 32bit syscall wrappers
Signed-off-by: Helge Deller <del...@gmx.de>
diff -up ./usr/include/endian.h.org ./usr/include/endian.h
--- ./usr/include/endian.h.org 2014-04-23 21:59:42.804919200 +0200
+++ ./usr/include/endian.h 2014-04-23 22:00:04.492909971 +0200
@@ -12,4 +12,10 @@
#define PDP_ENDIAN __PDP_ENDIAN
#define BYTE_ORDER __BYTE_ORDER
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+# define __LONG_LONG_PAIR(HI, LO) LO, HI
+#elif __BYTE_ORDER == __BIG_ENDIAN
+# define __LONG_LONG_PAIR(HI, LO) HI, LO
+#endif
+
#endif /* _ENDIAN_H */
diff -up ./usr/klibc/Kbuild.org ./usr/klibc/Kbuild
--- ./usr/klibc/Kbuild.org 2014-04-23 21:44:26.729277658 +0200
+++ ./usr/klibc/Kbuild 2014-04-23 21:45:01.365263973 +0200
@@ -35,6 +35,7 @@ klib-y += vsnprintf.o snprintf.o vsprint
siglongjmp.o \
sigaction.o sigpending.o sigprocmask.o sigsuspend.o \
pselect.o ppoll.o \
+ pread.o pwrite.o \
brk.o sbrk.o malloc.o realloc.o zalloc.o calloc.o \
mmap.o shm_open.o shm_unlink.o \
memcpy.o memcmp.o memset.o memccpy.o memmem.o memswap.o \
diff -up ./usr/klibc/pread.c.org ./usr/klibc/pread.c
--- ./usr/klibc/pread.c.org 2014-04-23 22:01:13.300880914 +0200
+++ ./usr/klibc/pread.c 2014-04-23 22:12:31.688611468 +0200
@@ -0,0 +1,29 @@
+/*
+ * pread.c
+ *
+ * Some architectures need to wrap the system call
+ */
+
+#include <endian.h>
+#include <sys/syscall.h>
+
+#if defined(__hppa__)
+
+#if _BITSIZE == 32
+extern size_t __pread(int, void *, size_t, unsigned int, unsigned int);
+#else
+extern size_t __pread(int, void *, size_t, off_t);
+#endif
+
+size_t pread(int fd, void *buf, size_t count, off_t offset)
+{
+#if _BITSIZE == 32
+ unsigned int hi = offset >> 32;
+ unsigned int lo = (unsigned int) offset;
+ return __pread(fd, buf, count, __LONG_LONG_PAIR(hi, lo));
+#else
+ return __pread(fd, buf, count, offset);
+#endif
+}
+
+#endif
diff -up ./usr/klibc/pwrite.c.org ./usr/klibc/pwrite.c
--- ./usr/klibc/pwrite.c.org 2014-04-23 22:14:58.948578818 +0200
+++ ./usr/klibc/pwrite.c 2014-04-23 22:18:28.756538001 +0200
@@ -0,0 +1,29 @@
+/*
+ * pwrite.c
+ *
+ * Some architectures need to wrap the system call
+ */
+
+#include <endian.h>
+#include <sys/syscall.h>
+
+#if defined(__hppa__)
+
+#if _BITSIZE == 32
+extern ssize_t __pwrite(int, const void *, size_t, unsigned int, unsigned int);
+#else
+extern ssize_t __pwrite(int, const void *, size_t, off_t);
+#endif
+
+size_t pwrite(int fd, void *buf, size_t count, off_t offset)
+{
+#if _BITSIZE == 32
+ unsigned int hi = offset >> 32;
+ unsigned int lo = (unsigned int) offset;
+ return __pwrite(fd, buf, count, __LONG_LONG_PAIR(hi, lo));
+#else
+ return __pwrite(fd, buf, count, offset);
+#endif
+}
+
+#endif
diff -up ./usr/klibc/SYSCALLS.def.org ./usr/klibc/SYSCALLS.def
--- ./usr/klibc/SYSCALLS.def.org 2014-04-23 21:07:52.205313808 +0200
+++ ./usr/klibc/SYSCALLS.def 2014-04-23 22:11:36.884632150 +0200
@@ -188,8 +188,10 @@ int fdatasync,fsync::fdatasync(int);
int readv(int, const struct iovec *, int);
int writev(int, const struct iovec *, int);
int ftruncate64,ftruncate::ftruncate(int, off_t);
-ssize_t pread64,pread::pread(int, void *, size_t, off_t);
-ssize_t pwrite64,pwrite::pwrite(int, void *, size_t, off_t);
+<parisc> ssize_t pread64,pread::__pread(int, void *, size_t, off_t);
+<parisc> ssize_t pwrite64,pwrite::__pwrite(int, void *, size_t, off_t);
+<!parisc> ssize_t pread64,pread::pread(int, void *, size_t, off_t);
+<!parisc> ssize_t pwrite64,pwrite::pwrite(int, void *, size_t, off_t);
int sync_file_range,fdatasync,fsync::sync_file_range(int, off_t, off_t, unsigned int);
<?> int splice(int, off_t *, int, off_t *, size_t, unsigned int);
<?> int tee(int, int, size_t, unsigned int);
