[v2,1/3] libc: fix setting return value and errno in fallocate()

Submitted by Yuriy Kolerov on Sept. 22, 2015, 6:15 p.m.

Details

Message ID 1442945760-30551-1-git-send-email-yuriy.kolerov@synopsys.com
State New
Headers show

Commit Message

Yuriy Kolerov Sept. 22, 2015, 6:15 p.m.
fallocate system call must return 0 on success. On error,
-1 is returned and errno is set to indicate the error.

However there is an error in fallocate which is fixed by
this patch - it does not set errno and returns invalid
value on error (it returns error code instead of -1).

Signed-off-by: Yuriy Kolerov <yuriy.kolerov@synopsys.com>
---
 libc/sysdeps/linux/common/fallocate.c   | 9 ++++++---
 libc/sysdeps/linux/common/fallocate64.c | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

Comments

Vineet Gupta Sept. 23, 2015, 2:41 a.m.
On Tuesday 22 September 2015 11:46 PM, Yuriy Kolerov wrote:

fallocate system call must return 0 on success. On error,
-1 is returned and errno is set to indicate the error.

However there is an error in fallocate which is fixed by
this patch - it does not set errno and returns invalid
value on error (it returns error code instead of -1).

Signed-off-by: Yuriy Kolerov <yuriy.kolerov@synopsys.com><mailto:yuriy.kolerov@synopsys.com>

You still fail to mention that it fixes LTP test xyz ?

Patch hide | download patch | download mbox

diff --git a/libc/sysdeps/linux/common/fallocate.c b/libc/sysdeps/linux/common/fallocate.c
index b231226..b2309e9 100644
--- a/libc/sysdeps/linux/common/fallocate.c
+++ b/libc/sysdeps/linux/common/fallocate.c
@@ -12,6 +12,7 @@ 
 #include <fcntl.h>
 #include <bits/kernel-features.h>
 #include <stdint.h>
+#include <errno.h>
 
 #if defined __NR_fallocate
 extern __typeof(fallocate) __libc_fallocate attribute_hidden;
@@ -34,9 +35,11 @@  int attribute_hidden __libc_fallocate(int fd, int mode, __off_t offset, __off_t
 # else
 # error your machine is neither 32 bit or 64 bit ... it must be magical
 # endif
-	if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
-		return INTERNAL_SYSCALL_ERRNO (ret, err);
-	return 0;
+	if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err))) {
+		__set_errno(INTERNAL_SYSCALL_ERRNO (ret, err));
+		ret = -1;
+	}
+	return ret;
 }
 
 # if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
diff --git a/libc/sysdeps/linux/common/fallocate64.c b/libc/sysdeps/linux/common/fallocate64.c
index cf75693..1aa351e 100644
--- a/libc/sysdeps/linux/common/fallocate64.c
+++ b/libc/sysdeps/linux/common/fallocate64.c
@@ -13,6 +13,7 @@ 
 #include <fcntl.h>
 #include <bits/kernel-features.h>
 #include <stdint.h>
+#include <errno.h>
 
 #if defined __NR_fallocate
 
@@ -27,9 +28,11 @@  int attribute_hidden __libc_fallocate64(int fd, int mode, __off64_t offset,
 	INTERNAL_SYSCALL_DECL(err);
 	ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, mode,
 		OFF64_HI_LO (offset), OFF64_HI_LO (len)));
-	if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
-		return INTERNAL_SYSCALL_ERRNO (ret, err);
-	return 0;
+	if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err))) {
+		__set_errno(INTERNAL_SYSCALL_ERRNO (ret, err));
+		ret = -1;
+	}
+	return ret;
 }
 
 #  if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU