|
 |
f239de |
From c951a12b1594158bb87fbc4d8a89b326c34e711f Mon Sep 17 00:00:00 2001
|
|
|
f239de |
From: Theodore Ts'o <tytso@mit.edu>
|
|
|
f239de |
Date: Thu, 21 Jan 2021 16:00:01 -0500
|
|
|
f239de |
Subject: [PATCH 15/46] libext2fs: fix incorrect negative error return in unix
|
|
|
f239de |
and sparse io managers
|
|
|
f239de |
Content-Type: text/plain
|
|
|
f239de |
|
|
|
f239de |
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
|
|
f239de |
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
|
|
|
f239de |
---
|
|
|
f239de |
lib/ext2fs/sparse_io.c | 4 ++--
|
|
|
f239de |
lib/ext2fs/unix_io.c | 2 +-
|
|
|
f239de |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
f239de |
|
|
|
f239de |
diff --git a/lib/ext2fs/sparse_io.c b/lib/ext2fs/sparse_io.c
|
|
|
f239de |
index 5e0e2cd9..f287e76d 100644
|
|
|
f239de |
--- a/lib/ext2fs/sparse_io.c
|
|
|
f239de |
+++ b/lib/ext2fs/sparse_io.c
|
|
|
f239de |
@@ -138,7 +138,7 @@ static errcode_t io_manager_configure(struct sparse_io_params *params,
|
|
|
f239de |
retval = io_manager_import_sparse(params, sm, io);
|
|
|
f239de |
if (retval) {
|
|
|
f239de |
if (!params->block_size || !params->blocks_count) {
|
|
|
f239de |
- retval = -EINVAL;
|
|
|
f239de |
+ retval = EINVAL;
|
|
|
f239de |
goto err_params;
|
|
|
f239de |
}
|
|
|
f239de |
sm->block_size = params->block_size;
|
|
|
f239de |
@@ -229,7 +229,7 @@ static errcode_t read_sparse_argv(const char *name, bool is_fd,
|
|
|
f239de |
|
|
|
f239de |
if (ret < 1) {
|
|
|
f239de |
free(sparse_params->file);
|
|
|
f239de |
- return -EINVAL;
|
|
|
f239de |
+ return EINVAL;
|
|
|
f239de |
}
|
|
|
f239de |
return 0;
|
|
|
f239de |
}
|
|
|
f239de |
diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
|
|
|
f239de |
index 628e60c3..2bcd435c 100644
|
|
|
f239de |
--- a/lib/ext2fs/unix_io.c
|
|
|
f239de |
+++ b/lib/ext2fs/unix_io.c
|
|
|
f239de |
@@ -733,7 +733,7 @@ static errcode_t unixfd_open(const char *str_fd, int flags,
|
|
|
f239de |
#if defined(HAVE_FCNTL)
|
|
|
f239de |
fd_flags = fcntl(fd, F_GETFD);
|
|
|
f239de |
if (fd_flags == -1)
|
|
|
f239de |
- return -EBADF;
|
|
|
f239de |
+ return EBADF;
|
|
|
f239de |
|
|
|
f239de |
flags = 0;
|
|
|
f239de |
if (fd_flags & O_RDWR)
|
|
|
f239de |
--
|
|
|
f239de |
2.35.1
|
|
|
f239de |
|