From nobody Mon Feb 9 19:53:46 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579786745; cv=none; d=zohomail.com; s=zohoarc; b=dD7767RhnuACRiXYLbf3M/O6+lkGa7cWyw9t92ymc6BPOmG6ys2k3EifJ5IBS9z5zcluV3uibrsmc8f5bWK8JkzmKLls7352m4eCwXrQCMxQ7acgndUN3eZhOcQN3oxehjjftg/fEzGkQMZdqOrBz9wSO5kBHyc/oKRVYQSxgRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579786745; h=Content-Type:Content-Transfer-Encoding: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=A2OLDzwvIkswhQnYmC967hKOHC8UuZ0BirW2egCo2xI=; b=hB//klOAkpAqYq9qmvZAsyndpTta2y7wWOaG/uFnwMHBReKuT9boTBVEUPGqAcIy5gmcrJ9Sb3hL8L2SGVkkNGqfUx5UIdjVJIsWop4VimG12CUsqLXAUQo5UBuitP9jxcJmrmHWNaWC9H1+dTTdWYKl3YSzRLGETGQHET9PUGI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1579786745183523.5374959449903; Thu, 23 Jan 2020 05:39:05 -0800 (PST) Received: from localhost ([::1]:57096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuccV-00016k-KD for importer@patchew.org; Thu, 23 Jan 2020 08:34:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40823) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub9N-0002mn-UQ for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iub9M-0005Oq-Lu for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:53 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51588 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iub9M-0005Ob-IU for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:52 -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-143-fEQlAa0lMV-mJiHccUBdKQ-1; Thu, 23 Jan 2020 06:59:50 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EAFD28010C5 for ; Thu, 23 Jan 2020 11:59:49 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42C551CB; Thu, 23 Jan 2020 11:59:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A2OLDzwvIkswhQnYmC967hKOHC8UuZ0BirW2egCo2xI=; b=US7lu9uSwi90C1qlvbrzBeHYg5eaH8HFyD7NaNqb5a5lpzhxKJXdInMIdFsBDf+rdpJ+eT uiTMfrGsgx+/CVE9WNd/gDtGT3C4xXmqZq6M8VNwktIFCtrrct8/oRNTqpv/dyiVsoxnN6 tk2gdfDhMdmEfnqKjGluBTi+36aK65c= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 053/111] virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV Date: Thu, 23 Jan 2020 11:57:43 +0000 Message-Id: <20200123115841.138849-54-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: fEQlAa0lMV-mJiHccUBdKQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vivek Goyal Caller can set FUSE_WRITE_KILL_PRIV in write_flags. Parse it and pass it to the filesystem. Signed-off-by: Vivek Goyal Reviewed-by: Misono Tomohiro Reviewed-by: Sergio Lopez Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_common.h | 6 +++++- tools/virtiofsd/fuse_lowlevel.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/virtiofsd/fuse_common.h b/tools/virtiofsd/fuse_common.h index f8f6433743..686c42c0a5 100644 --- a/tools/virtiofsd/fuse_common.h +++ b/tools/virtiofsd/fuse_common.h @@ -93,8 +93,12 @@ struct fuse_file_info { */ unsigned int cache_readdir:1; =20 + /* Indicates that suid/sgid bits should be removed upon write */ + unsigned int kill_priv:1; + + /** Padding. Reserved for future use*/ - unsigned int padding:25; + unsigned int padding:24; unsigned int padding2:32; =20 /* diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 02e1d83038..2d6dc5a680 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -1142,6 +1142,7 @@ static void do_write(fuse_req_t req, fuse_ino_t nodei= d, memset(&fi, 0, sizeof(fi)); fi.fh =3D arg->fh; fi.writepage =3D (arg->write_flags & FUSE_WRITE_CACHE) !=3D 0; + fi.kill_priv =3D !!(arg->write_flags & FUSE_WRITE_KILL_PRIV); =20 fi.lock_owner =3D arg->lock_owner; fi.flags =3D arg->flags; @@ -1177,7 +1178,8 @@ static void do_write_buf(fuse_req_t req, fuse_ino_t n= odeid, fi.lock_owner =3D arg->lock_owner; fi.flags =3D arg->flags; fi.fh =3D arg->fh; - fi.writepage =3D arg->write_flags & FUSE_WRITE_CACHE; + fi.writepage =3D !!(arg->write_flags & FUSE_WRITE_CACHE); + fi.kill_priv =3D !!(arg->write_flags & FUSE_WRITE_KILL_PRIV); =20 if (ibufv->count =3D=3D 1) { assert(!(tmpbufv.buf[0].flags & FUSE_BUF_IS_FD)); --=20 2.24.1