ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/file-posix: fix g_file_get_contents return path 

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>
This commit is contained in:
Sam Li 2023-07-27 19:58:44 +08:00 committed by Stefan Hajnoczi
parent a5942c177b
commit 29a242e165
1 changed files with 2 additions and 4 deletions

6
block/file-posix.c
View File

@ -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, static int get_sysfs_str_val(struct stat *st, const char *attribute,
char **val) { char **val) {
g_autofree char *sysfspath = NULL; g_autofree char *sysfspath = NULL;
int ret;
size_t len; size_t len;
if (!S_ISBLK(st->st_mode)) { if (!S_ISBLK(st->st_mode)) {
@ -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", sysfspath = g_strdup_printf("/sys/dev/block/%u:%u/queue/%s",
major(st->st_rdev), minor(st->st_rdev), major(st->st_rdev), minor(st->st_rdev),
attribute); attribute);
ret = g_file_get_contents(sysfspath, val, &len, NULL); if (!g_file_get_contents(sysfspath, val, &len, NULL)) {
if (ret == -1) {
return -ENOENT; return -ENOENT;
} }
@ -1253,7 +1251,7 @@ static int get_sysfs_str_val(struct stat *st, const char *attribute,
if (*(p + len - 1) == '\n') { if (*(p + len - 1) == '\n') {
*(p + len - 1) = '\0'; *(p + len - 1) = '\0';
} }
return ret; return 0;
} }
#endif #endif