[PATCH v2 28/46] statfs: Use statfs64 if arch does not have the statfs syscall

Markos Chandras markos.chandras at gmail.com
Mon Nov 26 14:24:10 UTC 2012


From: Markos Chandras <markos.chandras at imgtec.com>

Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>
---
 include/sys/statfs.h               |  1 +
 libc/sysdeps/linux/common/statfs.c | 53 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index c754ea3..de42696 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -31,6 +31,7 @@ __BEGIN_DECLS
 #ifndef __USE_FILE_OFFSET64
 extern int statfs (__const char *__file, struct statfs *__buf)
      __THROW __nonnull ((1, 2));
+libc_hidden_proto(statfs)
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (statfs,
diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c
index d24bc9d..34c2fcf 100644
--- a/libc/sysdeps/linux/common/statfs.c
+++ b/libc/sysdeps/linux/common/statfs.c
@@ -12,11 +12,62 @@
 #include <sys/param.h>
 #include <sys/vfs.h>
 
+#if defined(__NR_statfs64) && !defined(__NR_statfs)
 extern __typeof(statfs) __libc_statfs attribute_hidden;
+
+int __libc_statfs(const char *path, struct statfs *buf)
+{
+	struct statfs64 b;
+	int err;
+
+	/*
+	 * See if pointer has a sane value.
+	 * This does not prevent the user from
+	 * passing an arbitrary possitive value
+	 * that can lead to a segfault or potential
+	 * security problems
+	 */
+
+	if (buf == NULL || (int)buf < 0) {
+		__set_errno(EFAULT);
+		return -1;
+	}
+
+	err = INLINE_SYSCALL(statfs64, 3, path, sizeof(b), &b);
+
+	if (err < 0)
+		return -1;
+
+	buf->f_type = b.f_type;
+	buf->f_bsize = b.f_bsize;
+	buf->f_blocks = b.f_blocks;
+	buf->f_bfree = b.f_bfree;
+	buf->f_bavail = b.f_bavail;
+	buf->f_files = b.f_files;
+	buf->f_ffree = b.f_ffree;
+	buf->f_namelen = b.f_namelen;
+	buf->f_frsize = b.f_frsize;
+	buf->f_fsid = b.f_fsid;
+	memcpy(buf->f_spare, b.f_spare, sizeof(b.f_spare));
+
+	return err;
+}
+#if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__
+/* statfs is used by NPTL, so it must exported in case */
+weak_alias(__libc_statfs, statfs)
+#endif
+
+/* For systems which have both, prefer the old one */
+#else
+extern __typeof(statfs) __libc_statfs attribute_hidden;
+
 #define __NR___libc_statfs __NR_statfs
 _syscall2(int, __libc_statfs, const char *, path, struct statfs *, buf)
 
 #if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__
 /* statfs is used by NPTL, so it must exported in case */
-weak_alias(__libc_statfs,statfs)
+weak_alias(__libc_statfs, statfs)
+#endif
+
 #endif
+libc_hidden_def(statfs)
-- 
1.8.0




More information about the uClibc mailing list