aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDr. David Alan Gilbert <dgilbert@redhat.com>2020-06-29 12:54:19 +0100
committerDr. David Alan Gilbert <dgilbert@redhat.com>2020-07-03 16:23:05 +0100
commit55b22a60cc7ac25565a13813deba3d548cb48bd3 (patch)
treefe90f87faf5d19dacbd37a2b25e4a659386fdd9f /tools
parentb1288dfafbdfb64e86bf9cfa22fa0b399e44e198 (diff)
downloadqemu-55b22a60cc7ac25565a13813deba3d548cb48bd3.zip
qemu-55b22a60cc7ac25565a13813deba3d548cb48bd3.tar.gz
qemu-55b22a60cc7ac25565a13813deba3d548cb48bd3.tar.bz2
virtiofsd: Check capability calls
Check the capability calls worked. Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Acked-by: Vivek Goyal <vgoyal@redhat.com> Message-Id: <20200629115420.98443-3-dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/virtiofsd/passthrough_ll.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index e373e3b..99d5620 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -2589,7 +2589,7 @@ static void setup_capabilities(void)
*/
capng_setpid(syscall(SYS_gettid));
capng_clear(CAPNG_SELECT_BOTH);
- capng_updatev(CAPNG_ADD, CAPNG_PERMITTED | CAPNG_EFFECTIVE,
+ if (capng_updatev(CAPNG_ADD, CAPNG_PERMITTED | CAPNG_EFFECTIVE,
CAP_CHOWN,
CAP_DAC_OVERRIDE,
CAP_DAC_READ_SEARCH,
@@ -2599,11 +2599,21 @@ static void setup_capabilities(void)
CAP_SETUID,
CAP_MKNOD,
CAP_SETFCAP,
- -1);
+ -1)) {
+ fuse_log(FUSE_LOG_ERR, "%s: capng_updatev failed\n", __func__);
+ exit(1);
+ }
- capng_apply(CAPNG_SELECT_BOTH);
+ if (capng_apply(CAPNG_SELECT_BOTH)) {
+ fuse_log(FUSE_LOG_ERR, "%s: capng_apply failed\n", __func__);
+ exit(1);
+ }
cap.saved = capng_save_state();
+ if (!cap.saved) {
+ fuse_log(FUSE_LOG_ERR, "%s: capng_save_state failed\n", __func__);
+ exit(1);
+ }
pthread_mutex_unlock(&cap.mutex);
}