86ffd40d11
- Switch method of splitting off hw-s390x-virtio-gpu-ccw.so as a module to what was accepted upstream (bsc#1181103) * Patches dropped: hw-s390x-modularize-virtio-gpu-ccw.patch * Patches added: s390x-add-have_virtio_ccw.patch s390x-modularize-virtio-gpu-ccw.patch s390x-move-S390_ADAPTER_SUPPRESSIBLE.patch - Fix OOB access in sdhci interface (CVE-2020-17380, bsc#1175144, CVE-2020-25085, bsc#1176681, CVE-2021-3409, bsc#1182282) hw-sd-sd-Actually-perform-the-erase-oper.patch hw-sd-sd-Fix-build-error-when-DEBUG_SD-i.patch hw-sd-sdhci-Correctly-set-the-controller.patch hw-sd-sdhci-Don-t-transfer-any-data-when.patch hw-sd-sdhci-Don-t-write-to-SDHC_SYSAD-re.patch hw-sd-sdhci-Limit-block-size-only-when-S.patch hw-sd-sdhci-Reset-the-data-pointer-of-s-.patch hw-sd-sd-Move-the-sd_block_-read-write-a.patch hw-sd-sd-Skip-write-protect-groups-check.patch - Fix potential privilege escalation in virtiofsd tool (CVE-2021-20263, bsc#1183373) tools-virtiofsd-Replace-the-word-whiteli.patch viriofsd-Add-support-for-FUSE_HANDLE_KIL.patch virtiofsd-extract-lo_do_open-from-lo_ope.patch virtiofsd-optionally-return-inode-pointe.patch virtiofsd-prevent-opening-of-special-fil.patch virtiofs-drop-remapped-security.capabili.patch virtiofsd-Save-error-code-early-at-the-f.patch - Fix OOB access (stack overflow) in rtl8139 NIC emulation (CVE-2021-3416, bsc#1182968) net-introduce-qemu_receive_packet.patch rtl8139-switch-to-use-qemu_receive_packe.patch - Fix OOB access (stack overflow) in other NIC emulations (CVE-2021-3416) cadence_gem-switch-to-use-qemu_receive_p.patch dp8393x-switch-to-use-qemu_receive_packe.patch e1000-switch-to-use-qemu_receive_packet-.patch lan9118-switch-to-use-qemu_receive_packe.patch msf2-mac-switch-to-use-qemu_receive_pack.patch pcnet-switch-to-use-qemu_receive_packet-.patch sungem-switch-to-use-qemu_receive_packet.patch tx_pkt-switch-to-use-qemu_receive_packet.patch - Fix heap overflow in MSIx emulation (CVE-2020-27821, bsc#1179686) memory-clamp-cached-translation-in-case-.patch - Include upstream patches designated as stable material and reviewed for applicability to include here hw-arm-virt-Disable-pl011-clock-migratio.patch xen-block-Fix-removal-of-backend-instanc.patch - Fix package scripts to not use hard coded paths for temporary working directories and log files (bsc#1182425) OBS-URL: https://build.opensuse.org/request/show/882222 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=632
88 lines
3.2 KiB
Diff
88 lines
3.2 KiB
Diff
From: Vivek Goyal <vgoyal@redhat.com>
|
|
Date: Mon, 8 Feb 2021 17:40:23 -0500
|
|
Subject: virtiofsd: Save error code early at the failure callsite
|
|
|
|
Git-commit: 1e08f164e9fdc9528ad6990012301b9a04b0bc90
|
|
References: bsc#1183373, CVE-2021-20263
|
|
|
|
Change error code handling slightly in lo_setattr(). Right now we seem
|
|
to jump to out_err and assume that "errno" is valid and use that to
|
|
send reply.
|
|
|
|
But if caller has to do some other operations before jumping to out_err,
|
|
then it does the dance of first saving errno to saverr and the restore
|
|
errno before jumping to out_err. This makes it more confusing.
|
|
|
|
I am about to make more changes where caller will have to do some
|
|
work after error before jumping to out_err. I found it easier to
|
|
change the convention a bit. That is caller saves error in "saverr"
|
|
before jumping to out_err. And out_err uses "saverr" to send error
|
|
back and does not rely on "errno" having actual error.
|
|
|
|
v3: Resolved conflicts in lo_setattr() due to lo_inode_open() changes.
|
|
|
|
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Message-Id: <20210208224024.43555-2-vgoyal@redhat.com>
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
tools/virtiofsd/passthrough_ll.c | 9 +++++----
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
|
|
index 90f5281f10ab747098e57a3157c1..200a1d26bd11bcde5729c4f33195 100644
|
|
--- a/tools/virtiofsd/passthrough_ll.c
|
|
+++ b/tools/virtiofsd/passthrough_ll.c
|
|
@@ -710,6 +710,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
|
|
res = fchmodat(lo->proc_self_fd, procname, attr->st_mode, 0);
|
|
}
|
|
if (res == -1) {
|
|
+ saverr = errno;
|
|
goto out_err;
|
|
}
|
|
}
|
|
@@ -719,6 +720,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
|
|
|
|
res = fchownat(ifd, "", uid, gid, AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW);
|
|
if (res == -1) {
|
|
+ saverr = errno;
|
|
goto out_err;
|
|
}
|
|
}
|
|
@@ -730,16 +732,15 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
|
|
} else {
|
|
truncfd = lo_inode_open(lo, inode, O_RDWR);
|
|
if (truncfd < 0) {
|
|
- errno = -truncfd;
|
|
+ saverr = -truncfd;
|
|
goto out_err;
|
|
}
|
|
}
|
|
|
|
res = ftruncate(truncfd, attr->st_size);
|
|
+ saverr = res == -1 ? errno : 0;
|
|
if (!fi) {
|
|
- saverr = errno;
|
|
close(truncfd);
|
|
- errno = saverr;
|
|
}
|
|
if (res == -1) {
|
|
goto out_err;
|
|
@@ -772,6 +773,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
|
|
res = utimensat(lo->proc_self_fd, procname, tv, 0);
|
|
}
|
|
if (res == -1) {
|
|
+ saverr = errno;
|
|
goto out_err;
|
|
}
|
|
}
|
|
@@ -780,7 +782,6 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr,
|
|
return lo_getattr(req, ino, fi);
|
|
|
|
out_err:
|
|
- saverr = errno;
|
|
lo_inode_put(lo, &inode);
|
|
fuse_reply_err(req, saverr);
|
|
}
|