From nobody Fri May 17 11:28:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612829437; cv=none; d=zohomail.com; s=zohoarc; b=a+5ljxMHn6wXtZkzv/w7eKPFKtbpcgXYcnNMfe3Ua+IgGVpAkndCTCzS0KXjfugs7Il1Qyj6qR/OZT5iPHmHScc637DyFHxXve4jBm1LjIrTr4Ng3VTc0J3rsUx8/4DSC5sR4KTsnIu5ccXn2lRZ1DUNHKKyWPNHUwkgxPJDPkY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612829437; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SivcshdWiTpCJT5ZjThs9jcwl4uv8Miq82xhjYqSxro=; b=BlRDezenSYsJbG0YQeWbE4tRFDITMLWS1zTDykU6tkzJtvd34IgsQ4ber747Fk43AGhU+7GOoYskJGrPpaYr2XcKXfHo2kaqo7kpX6zSr1/kXnQ87lvam6+QOoY1AKE6Y9fFCHvrsyqU3FyOaF8PJ2Y7Xv5DFldKYILs/2+FXJA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612829437608344.9036143817643; Mon, 8 Feb 2021 16:10:37 -0800 (PST) Received: from localhost ([::1]:49366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Gc0-0005oZ-3A for importer@patchew.org; Mon, 08 Feb 2021 19:10:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9FD7-0005Ee-2Q for qemu-devel@nongnu.org; Mon, 08 Feb 2021 17:40:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9FD1-0006Xt-Fx for qemu-devel@nongnu.org; Mon, 08 Feb 2021 17:40:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-7_-9_EjbNXy6zT381Cx50A-1; Mon, 08 Feb 2021 17:40:39 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75FB21966320; Mon, 8 Feb 2021 22:40:38 +0000 (UTC) Received: from horse.redhat.com (ovpn-115-237.rdu2.redhat.com [10.10.115.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D80660C5B; Mon, 8 Feb 2021 22:40:32 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id D1EF9223D98; Mon, 8 Feb 2021 17:40:31 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612824041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SivcshdWiTpCJT5ZjThs9jcwl4uv8Miq82xhjYqSxro=; b=XqfSmlPgcF8TmDw9RHaJ4jREEKrt5guuP0Axi0HLvTo1INulQXO9JhUXywQU0ydoNtG7So JcjGKMOm0fA3naOKRfMgv24P6IfOdecO8kMzlMNf6Z3gijQnmspG4QLWmmBYroYj0YDSGV t87kzV+/5FMSs4yGVmhoJkUxORxGZvk= X-MC-Unique: 7_-9_EjbNXy6zT381Cx50A-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH v3 1/2] virtiofsd: Save error code early at the failure callsite Date: Mon, 8 Feb 2021 17:40:23 -0500 Message-Id: <20210208224024.43555-2-vgoyal@redhat.com> In-Reply-To: <20210208224024.43555-1-vgoyal@redhat.com> References: <20210208224024.43555-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vgoyal@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.57, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mszeredi@redhat.com, stefanha@redhat.com, dgilbert@redhat.com, vgoyal@redhat.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Dr. David Alan Gilbert --- 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 147b59338a..5dd6a4a4a6 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -698,6 +698,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, res =3D fchmodat(lo->proc_self_fd, procname, attr->st_mode, 0); } if (res =3D=3D -1) { + saverr =3D errno; goto out_err; } } @@ -707,6 +708,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, =20 res =3D fchownat(ifd, "", uid, gid, AT_EMPTY_PATH | AT_SYMLINK_NOF= OLLOW); if (res =3D=3D -1) { + saverr =3D errno; goto out_err; } } @@ -718,16 +720,15 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino= , struct stat *attr, } else { truncfd =3D lo_inode_open(lo, inode, O_RDWR); if (truncfd < 0) { - errno =3D -truncfd; + saverr =3D -truncfd; goto out_err; } } =20 res =3D ftruncate(truncfd, attr->st_size); + saverr =3D res =3D=3D -1 ? errno : 0; if (!fi) { - saverr =3D errno; close(truncfd); - errno =3D saverr; } if (res =3D=3D -1) { goto out_err; @@ -760,6 +761,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, res =3D utimensat(lo->proc_self_fd, procname, tv, 0); } if (res =3D=3D -1) { + saverr =3D errno; goto out_err; } } @@ -768,7 +770,6 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, return lo_getattr(req, ino, fi); =20 out_err: - saverr =3D errno; lo_inode_put(lo, &inode); fuse_reply_err(req, saverr); } --=20 2.25.4 From nobody Fri May 17 11:28:41 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612829084; cv=none; d=zohomail.com; s=zohoarc; b=k4Ex/ImPqR8f8HwCuTLbABTQ3L5lAwFTzTulHqdDi0YzaxifjEHwWncdV1Mg7pE0BSVx9gdYsAA5qOxHbmfVwJ9N/AOx5YIOaDBm9l6TwoD58Pc4hQqz6csWt4PPnpH4VvY2SEU7pxieIUSydHTZHMzpUZVytmYBHDWuSVwTFf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612829084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Cw/sMGIf/uMCDRvyoAv7IQmxQlDUE/AzW76vvNmKtcI=; b=h2Kq2SDD46KaTWFWgwhr09JE72sudr39mIKiELaKQGW15mq0OvAUIj0i0AGNe7qpmB3ghDt7LDgnmDaIs1t3qRI9tb2/G1rgayj4SA0c4EQh4n69pDVmTKOAkA7BsW1f9/xLzpE/HQUAAtVKOrrnPijNcQkD0K1AXQhZuH5obag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612829084872837.5580165502887; Mon, 8 Feb 2021 16:04:44 -0800 (PST) Received: from localhost ([::1]:33238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9GWJ-0007Dp-Ov for importer@patchew.org; Mon, 08 Feb 2021 19:04:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9FD6-0005Eb-Ls for qemu-devel@nongnu.org; Mon, 08 Feb 2021 17:40:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9FD1-0006Yj-F2 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 17:40:48 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-435-Qw2UNRxvPjeRlew14ud5Rw-1; Mon, 08 Feb 2021 17:40:39 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6A8E46D4E8; Mon, 8 Feb 2021 22:40:38 +0000 (UTC) Received: from horse.redhat.com (ovpn-115-237.rdu2.redhat.com [10.10.115.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4825E19C78; Mon, 8 Feb 2021 22:40:32 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id D61AB223D99; Mon, 8 Feb 2021 17:40:31 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612824042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Cw/sMGIf/uMCDRvyoAv7IQmxQlDUE/AzW76vvNmKtcI=; b=g1F3qbpAolYKG9hVyTyOXxdUCNJ2Yf1xr7lFZ44ZqX47r+MGen1cc2PUZabuZfkJ8aOjYq YQlcISCQz4yXJjePKCfagHvdDJVWjNiK2jgRvehtlpn9Vj8lGqHBxo+X89m7ugk/6t3DL+ fZswd8e6CbSyRIql4jRlm8JOFN6Sp8o= X-MC-Unique: Qw2UNRxvPjeRlew14ud5Rw-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH v3 2/2] viriofsd: Add support for FUSE_HANDLE_KILLPRIV_V2 Date: Mon, 8 Feb 2021 17:40:24 -0500 Message-Id: <20210208224024.43555-3-vgoyal@redhat.com> In-Reply-To: <20210208224024.43555-1-vgoyal@redhat.com> References: <20210208224024.43555-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vgoyal@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.57, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mszeredi@redhat.com, stefanha@redhat.com, dgilbert@redhat.com, vgoyal@redhat.com, groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This patch adds basic support for FUSE_HANDLE_KILLPRIV_V2. virtiofsd can enable/disable this by specifying option "-o killpriv_v2/no_killpriv_v2= ". By default this is enabled as long as client supports it Enabling this option helps with performance in write path. Without this option, currently every write is first preceeded with a getxattr() operation to find out if security.capability is set. (Write is supposed to clear security.capability). With this option enabled, server is signing up for clearing security.capability on every WRITE and also clearing suid/sgid subject to certain rules. This gets rid of extra getxattr() call for every WRITE and improves performance. This is true when virtiofsd is run with option -o xattr. What does enabling FUSE_HANDLE_KILLPRIV_V2 mean for file server implementat= ion. It needs to adhere to following rules. Thanks to Miklos for this summary. - clear "security.capability" on write, truncate and chown unconditionally - clear suid/sgid in case of following. Note, sgid is cleared only if group executable bit is set. o setattr has FATTR_SIZE and FATTR_KILL_SUIDGID set. o setattr has FATTR_UID or FATTR_GID o open has O_TRUNC and FUSE_OPEN_KILL_SUIDGID o create has O_TRUNC and FUSE_OPEN_KILL_SUIDGID flag set. o write has FUSE_WRITE_KILL_SUIDGID From Linux VFS client perspective, here are the requirements. - caps are always cleared on chown/write/truncate - suid is always cleared on chown, while for truncate/write it is cleared only if caller does not have CAP_FSETID. - sgid is always cleared on chown, while for truncate/write it is cleared only if caller does not have CAP_FSETID as well as file has group execute permission. virtiofsd implementation has not changed much to adhere to above ruls. And reason being that current assumption is that we are running on Linux and on top of filesystems like ext4/xfs which already follow above rules. On write, truncate, chown, seucurity.capability is cleared. And virtiofsd drops CAP_FSETID if need be and that will lead to clearing of suid/sgid. But if virtiofsd is running on top a filesystem which breaks above assumpti= ons, then it will have to take extra actions to emulate above. That's a TODO for later when need arises. Note: create normally is supposed to be called only when file does not exist. So generally there should not be any question of clearing setuid/setgid. But it is possible that after client checks that file is not present, some other client creates file on server and this race can trigger sending FUSE_CREATE. In that case, if O_TRUNC is set, we should clear suid/sgid if FUSE_OPEN_KILL_SUIDGID is also set. v3: - Resolved conflicts due to lo_inode_open() changes. - Moved capability code in lo_do_open() so that both lo_open() and lo_create() can benefit from common code. - Dropped changes to kernel headers as these are part of qemu already. Signed-off-by: Vivek Goyal Acked-by: Stefan Hajnoczi Reviewed-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_common.h | 15 ++++++ tools/virtiofsd/fuse_lowlevel.c | 11 ++++- tools/virtiofsd/fuse_lowlevel.h | 1 + tools/virtiofsd/passthrough_ll.c | 84 +++++++++++++++++++++++++++++--- 4 files changed, 103 insertions(+), 8 deletions(-) diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index a090040bb2..fa9671872e 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -357,6 +357,21 @@ struct fuse_file_info { */ #define FUSE_CAP_SUBMOUNTS (1 << 27) =20 +/** + * Indicates that the filesystem is responsible for clearing + * security.capability xattr and clearing setuid and setgid bits. Following + * are the rules. + * - clear "security.capability" on write, truncate and chown unconditiona= lly + * - clear suid/sgid if following is true. Note, sgid is cleared only if + * group executable bit is set. + * o setattr has FATTR_SIZE and FATTR_KILL_SUIDGID set. + * o setattr has FATTR_UID or FATTR_GID + * o open has O_TRUNC and FUSE_OPEN_KILL_SUIDGID + * o create has O_TRUNC and FUSE_OPEN_KILL_SUIDGID flag set. + * o write has FUSE_WRITE_KILL_SUIDGID + */ +#define FUSE_CAP_HANDLE_KILLPRIV_V2 (1 << 28) + /** * Ioctl flags * diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index e94b71110b..f78692ef66 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -855,7 +855,7 @@ static void do_setattr(fuse_req_t req, fuse_ino_t nodei= d, FUSE_SET_ATTR_GID | FUSE_SET_ATTR_SIZE | FUSE_SET_ATTR_ATIME | FUSE_SET_ATTR_MTIME | FUSE_SET_ATTR_ATIME_NOW | FUSE_SET_ATTR_MTIME_NOW | - FUSE_SET_ATTR_CTIME; + FUSE_SET_ATTR_CTIME | FUSE_SET_ATTR_KILL_SUIDGID; =20 req->se->op.setattr(req, nodeid, &stbuf, arg->valid, fi); } else { @@ -1069,6 +1069,7 @@ static void do_create(fuse_req_t req, fuse_ino_t node= id, =20 memset(&fi, 0, sizeof(fi)); fi.flags =3D arg->flags; + fi.kill_priv =3D arg->open_flags & FUSE_OPEN_KILL_SUIDGID; =20 req->ctx.umask =3D arg->umask; =20 @@ -1092,6 +1093,7 @@ static void do_open(fuse_req_t req, fuse_ino_t nodeid, =20 memset(&fi, 0, sizeof(fi)); fi.flags =3D arg->flags; + fi.kill_priv =3D arg->open_flags & FUSE_OPEN_KILL_SUIDGID; =20 if (req->se->op.open) { req->se->op.open(req, nodeid, &fi); @@ -1983,6 +1985,9 @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid, if (arg->flags & FUSE_SUBMOUNTS) { se->conn.capable |=3D FUSE_CAP_SUBMOUNTS; } + if (arg->flags & FUSE_HANDLE_KILLPRIV_V2) { + se->conn.capable |=3D FUSE_CAP_HANDLE_KILLPRIV_V2; + } #ifdef HAVE_SPLICE #ifdef HAVE_VMSPLICE se->conn.capable |=3D FUSE_CAP_SPLICE_WRITE | FUSE_CAP_SPLICE_MOVE; @@ -2114,6 +2119,10 @@ static void do_init(fuse_req_t req, fuse_ino_t nodei= d, outarg.congestion_threshold =3D se->conn.congestion_threshold; outarg.time_gran =3D se->conn.time_gran; =20 + if (se->conn.want & FUSE_CAP_HANDLE_KILLPRIV_V2) { + outarg.flags |=3D FUSE_HANDLE_KILLPRIV_V2; + } + fuse_log(FUSE_LOG_DEBUG, " INIT: %u.%u\n", outarg.major, outarg.mino= r); fuse_log(FUSE_LOG_DEBUG, " flags=3D0x%08x\n", outarg.flags); fuse_log(FUSE_LOG_DEBUG, " max_readahead=3D0x%08x\n", outarg.max_rea= dahead); diff --git a/tools/virtiofsd/fuse_lowlevel.h b/tools/virtiofsd/fuse_lowleve= l.h index 0e10a14bc9..3bf786b034 100644 --- a/tools/virtiofsd/fuse_lowlevel.h +++ b/tools/virtiofsd/fuse_lowlevel.h @@ -143,6 +143,7 @@ struct fuse_forget_data { #define FUSE_SET_ATTR_ATIME_NOW (1 << 7) #define FUSE_SET_ATTR_MTIME_NOW (1 << 8) #define FUSE_SET_ATTR_CTIME (1 << 10) +#define FUSE_SET_ATTR_KILL_SUIDGID (1 << 11) =20 /* * Request methods and replies diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 5dd6a4a4a6..74ce7b8e26 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -168,6 +168,7 @@ struct lo_data { =20 /* An O_PATH file descriptor to /proc/self/fd/ */ int proc_self_fd; + int user_killpriv_v2, killpriv_v2; }; =20 static const struct fuse_opt lo_opts[] =3D { @@ -198,6 +199,8 @@ static const struct fuse_opt lo_opts[] =3D { { "allow_direct_io", offsetof(struct lo_data, allow_direct_io), 1 }, { "no_allow_direct_io", offsetof(struct lo_data, allow_direct_io), 0 }, { "announce_submounts", offsetof(struct lo_data, announce_submounts), = 1 }, + { "killpriv_v2", offsetof(struct lo_data, user_killpriv_v2), 1 }, + { "no_killpriv_v2", offsetof(struct lo_data, user_killpriv_v2), 0 }, FUSE_OPT_END }; static bool use_syslog =3D false; @@ -630,6 +633,34 @@ static void lo_init(void *userdata, struct fuse_conn_i= nfo *conn) "does not support it\n"); lo->announce_submounts =3D false; } + + if (lo->user_killpriv_v2 =3D=3D 1) { + /* + * User explicitly asked for this option. Enable it unconditionall= y. + * If connection does not have this capability, it should fail + * in fuse_lowlevel.c + */ + fuse_log(FUSE_LOG_DEBUG, "lo_init: enabling killpriv_v2\n"); + conn->want |=3D FUSE_CAP_HANDLE_KILLPRIV_V2; + lo->killpriv_v2 =3D 1; + } else if (lo->user_killpriv_v2 =3D=3D -1 && + conn->capable & FUSE_CAP_HANDLE_KILLPRIV_V2) { + /* + * User did not specify a value for killpriv_v2. By default enable= it + * if connection offers this capability + */ + fuse_log(FUSE_LOG_DEBUG, "lo_init: enabling killpriv_v2\n"); + conn->want |=3D FUSE_CAP_HANDLE_KILLPRIV_V2; + lo->killpriv_v2 =3D 1; + } else { + /* + * Either user specified to disable killpriv_v2, or connection does + * not offer this capability. Disable killpriv_v2 in both the cases + */ + fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling killpriv_v2\n"); + conn->want &=3D ~FUSE_CAP_HANDLE_KILLPRIV_V2; + lo->killpriv_v2 =3D 0; + } } =20 static void lo_getattr(fuse_req_t req, fuse_ino_t ino, @@ -714,7 +745,10 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino,= struct stat *attr, } if (valid & FUSE_SET_ATTR_SIZE) { int truncfd; + bool kill_suidgid; + bool cap_fsetid_dropped =3D false; =20 + kill_suidgid =3D lo->killpriv_v2 && (valid & FUSE_SET_ATTR_KILL_SU= IDGID); if (fi) { truncfd =3D fd; } else { @@ -725,8 +759,25 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino,= struct stat *attr, } } =20 + if (kill_suidgid) { + res =3D drop_effective_cap("FSETID", &cap_fsetid_dropped); + if (res !=3D 0) { + saverr =3D res; + if (!fi) { + close(truncfd); + } + goto out_err; + } + } + res =3D ftruncate(truncfd, attr->st_size); saverr =3D res =3D=3D -1 ? errno : 0; + + if (cap_fsetid_dropped) { + if (gain_effective_cap("FSETID")) { + fuse_log(FUSE_LOG_ERR, "Failed to gain CAP_FSETID\n"); + } + } if (!fi) { close(truncfd); } @@ -1709,11 +1760,27 @@ static int lo_do_open(struct lo_data *lo, struct lo= _inode *inode, { ssize_t fh; int fd =3D existing_fd; + int err; + bool cap_fsetid_dropped =3D false; + bool kill_suidgid =3D lo->killpriv_v2 && fi->kill_priv; =20 update_open_flags(lo->writeback, lo->allow_direct_io, fi); =20 if (fd < 0) { + if (kill_suidgid) { + err =3D drop_effective_cap("FSETID", &cap_fsetid_dropped); + if (err) { + return err; + } + } + fd =3D lo_inode_open(lo, inode, fi->flags); + + if (cap_fsetid_dropped) { + if (gain_effective_cap("FSETID")) { + fuse_log(FUSE_LOG_ERR, "Failed to gain CAP_FSETID\n"); + } + } if (fd < 0) { return -fd; } @@ -1747,8 +1814,8 @@ static void lo_create(fuse_req_t req, fuse_ino_t pare= nt, const char *name, int err; struct lo_cred old =3D {}; =20 - fuse_log(FUSE_LOG_DEBUG, "lo_create(parent=3D%" PRIu64 ", name=3D%s)\n= ", parent, - name); + fuse_log(FUSE_LOG_DEBUG, "lo_create(parent=3D%" PRIu64 ", name=3D%s)" + " kill_priv=3D%d\n", parent, name, fi->kill_priv); =20 if (!is_safe_path_component(name)) { fuse_reply_err(req, EINVAL); @@ -1981,8 +2048,8 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, s= truct fuse_file_info *fi) struct lo_inode *inode =3D lo_inode(req, ino); int err; =20 - fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=3D%" PRIu64 ", flags=3D%d)\n", i= no, - fi->flags); + fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=3D%" PRIu64 ", flags=3D%d, kill_= priv=3D%d)" + "\n", ino, fi->flags, fi->kill_priv); =20 if (!inode) { fuse_reply_err(req, EBADF); @@ -2121,12 +2188,14 @@ static void lo_write_buf(fuse_req_t req, fuse_ino_t= ino, out_buf.buf[0].pos =3D off; =20 fuse_log(FUSE_LOG_DEBUG, - "lo_write_buf(ino=3D%" PRIu64 ", size=3D%zd, off=3D%lu)\n", i= no, - out_buf.buf[0].size, (unsigned long)off); + "lo_write_buf(ino=3D%" PRIu64 ", size=3D%zd, off=3D%lu kill_p= riv=3D%d)\n", + ino, out_buf.buf[0].size, (unsigned long)off, fi->kill_priv); =20 /* * If kill_priv is set, drop CAP_FSETID which should lead to kernel - * clearing setuid/setgid on file. + * clearing setuid/setgid on file. Note, for WRITE, we need to do + * this even if killpriv_v2 is not enabled. fuse direct write path + * relies on this. */ if (fi->kill_priv) { res =3D drop_effective_cap("FSETID", &cap_fsetid_dropped); @@ -3534,6 +3603,7 @@ int main(int argc, char *argv[]) .posix_lock =3D 0, .allow_direct_io =3D 0, .proc_self_fd =3D -1, + .user_killpriv_v2 =3D -1, }; struct lo_map_elem *root_elem; struct lo_map_elem *reserve_elem; --=20 2.25.4