From: Greg Kurz <groug@kaod.org>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: Daniel Henrique Barboza <danielhb413@gmail.com>,
Greg Kurz <groug@kaod.org>
Subject: [PULL 2/5] 9p: local: always return -1 on error in local_unlinkat_common
Date: Mon, 20 Jan 2020 18:06:37 +0100 [thread overview]
Message-ID: <20200120170640.524184-3-groug@kaod.org> (raw)
In-Reply-To: <20200120170640.524184-1-groug@kaod.org>
From: Daniel Henrique Barboza <danielhb413@gmail.com>
local_unlinkat_common() is supposed to always return -1 on error.
This is being done by jumps to the 'err_out' label, which is
a 'return ret' call, and 'ret' is initialized with -1.
Unfortunately there is a condition in which the function will
return 0 on error: in a case where flags == AT_REMOVEDIR, 'ret'
will be 0 when reaching
map_dirfd = openat_dir(...)
And, if map_dirfd == -1 and errno != ENOENT, the existing 'err_out'
jump will execute 'return ret', when ret is still set to zero
at that point.
This patch fixes it by changing all 'err_out' labels by
'return -1' calls, ensuring that the function will always
return -1 on error conditions. 'ret' can be left unintialized
since it's now being used just to store the result of 'unlinkat'
calls.
CC: Greg Kurz <groug@kaod.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
[groug: changed prefix in title to be "9p: local:"]
Signed-off-by: Greg Kurz <groug@kaod.org>
---
hw/9pfs/9p-local.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index d0592c3b4504..54e012e5b442 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -1076,7 +1076,7 @@ out:
static int local_unlinkat_common(FsContext *ctx, int dirfd, const char *name,
int flags)
{
- int ret = -1;
+ int ret;
if (ctx->export_flags & V9FS_SM_MAPPED_FILE) {
int map_dirfd;
@@ -1094,12 +1094,12 @@ static int local_unlinkat_common(FsContext *ctx, int dirfd, const char *name,
fd = openat_dir(dirfd, name);
if (fd == -1) {
- goto err_out;
+ return -1;
}
ret = unlinkat(fd, VIRTFS_META_DIR, AT_REMOVEDIR);
close_preserve_errno(fd);
if (ret < 0 && errno != ENOENT) {
- goto err_out;
+ return -1;
}
}
map_dirfd = openat_dir(dirfd, VIRTFS_META_DIR);
@@ -1107,16 +1107,14 @@ static int local_unlinkat_common(FsContext *ctx, int dirfd, const char *name,
ret = unlinkat(map_dirfd, name, 0);
close_preserve_errno(map_dirfd);
if (ret < 0 && errno != ENOENT) {
- goto err_out;
+ return -1;
}
} else if (errno != ENOENT) {
- goto err_out;
+ return -1;
}
}
- ret = unlinkat(dirfd, name, flags);
-err_out:
- return ret;
+ return unlinkat(dirfd, name, flags);
}
static int local_remove(FsContext *ctx, const char *path)
--
2.21.1
next prev parent reply other threads:[~2020-01-20 17:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 17:06 [PULL 0/5] 9p patches 2020-01-20 Greg Kurz
2020-01-20 17:06 ` [PULL 1/5] 9pfs: local: Fix possible memory leak in local_link() Greg Kurz
2020-01-20 17:06 ` Greg Kurz [this message]
2020-01-20 17:06 ` [PULL 3/5] 9p: init_in_iov_from_pdu can truncate the size Greg Kurz
2020-01-20 17:06 ` [PULL 4/5] virtfs-proxy-helper.c: remove 'err_out' label in setugid() Greg Kurz
2020-01-20 17:06 ` [PULL 5/5] 9pfs/9p.c: remove unneeded labels Greg Kurz
2020-01-21 10:54 ` [PULL 0/5] 9p patches 2020-01-20 Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2020-01-14 16:02 [PULL 0/5] 9p patches 2020-01-14 Greg Kurz
2020-01-14 16:02 ` [PULL 2/5] 9p: local: always return -1 on error in local_unlinkat_common Greg Kurz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120170640.524184-3-groug@kaod.org \
--to=groug@kaod.org \
--cc=danielhb413@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).