Skip to content

Commit

Permalink
block/file-posix: fix g_file_get_contents return path
Browse files Browse the repository at this point in the history
The g_file_get_contents() function returns a g_boolean. If it fails, the
returned value will be 0 instead of -1. Solve the issue by skipping
assigning ret value.

This issue was found by Matthew Rosato using virtio-blk-{pci,ccw} backed
by an NVMe partition e.g. /dev/nvme0n1p1 on s390x.

Signed-off-by: Sam Li <faithilikerun@gmail.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20230727115844.8480-1-faithilikerun@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
sgzerolc authored and stefanhaRH committed Jul 27, 2023
1 parent a5942c1 commit 29a242e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions block/file-posix.c
Original file line number Diff line number Diff line change
Expand Up @@ -1232,7 +1232,6 @@ static int hdev_get_max_hw_transfer(int fd, struct stat *st)
static int get_sysfs_str_val(struct stat *st, const char *attribute,
char **val) {
g_autofree char *sysfspath = NULL;
int ret;
size_t len;

if (!S_ISBLK(st->st_mode)) {
Expand All @@ -1242,8 +1241,7 @@ static int get_sysfs_str_val(struct stat *st, const char *attribute,
sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/%s",
major(st->st_rdev), minor(st->st_rdev),
attribute);
ret = g_file_get_contents(sysfspath, val, &len, NULL);
if (ret == -1) {
if (!g_file_get_contents(sysfspath, val, &len, NULL)) {
return -ENOENT;
}

Expand All @@ -1253,7 +1251,7 @@ static int get_sysfs_str_val(struct stat *st, const char *attribute,
if (*(p + len - 1) == '\n') {
*(p + len - 1) = '\0';
}
return ret;
return 0;
}
#endif

Expand Down

0 comments on commit 29a242e

Please sign in to comment.