From nobody Fri Apr 26 18:30:24 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=1596138536; cv=none; d=zohomail.com; s=zohoarc; b=MCnGXz2gGeYTROoOehyv3hTiA8X2viAlsXA+a7ZO31sEDqNBacO/mhzkAaS9Gpv+Ly4gVImLDCOxsMMCopdHLY3eHWpBIkNrdJAkTtpPhn3sLbJdF2Zq/In7YbjEf/m4fTkUGl4L/jv9haI/FpA0028UjbHeg523zht12Tyjd4Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596138536; 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=DGBjvtXB4L2SI6nM108SphLzu7g5pVlFobBDWdOoClA=; b=H7smwN49a9WAXmfVtIiWS57dNrZOJDPTF5vmDs+F2pkX05MoLMEaS7xqo3SQwvjzcoEHMyGTiKq+tjYjuomIoPdYEbg6Girc+nO37UhB6nCy6HFqVvCvYHFlqsOvh+lZM5Os3QbeIu0ImG5ODa3Jcf/DGoWExjXKF9dkljv7bFY= 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 1596138536099576.9335527599948; Thu, 30 Jul 2020 12:48:56 -0700 (PDT) Received: from localhost ([::1]:40200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1EXu-0002xD-2d for importer@patchew.org; Thu, 30 Jul 2020 15:48:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1EX4-0001jr-7j for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:02 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:49094 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1EX1-0006kd-I9 for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:01 -0400 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-400-QIigYv4FNPejSJWl7Kk6MA-1; Thu, 30 Jul 2020 15:47:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87445101C8A7 for ; Thu, 30 Jul 2020 19:47:55 +0000 (UTC) Received: from horse.redhat.com (ovpn-117-166.rdu2.redhat.com [10.10.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id D56FD1C6; Thu, 30 Jul 2020 19:47:49 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 5B80E223D04; Thu, 30 Jul 2020 15:47:48 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596138478; 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=DGBjvtXB4L2SI6nM108SphLzu7g5pVlFobBDWdOoClA=; b=BAaX17ER3gYrqDd6J+bEGugFPC53yS3fXOkajF8nzgMOYGXQuELxiu+9Uh0oXQvPwFoKf+ klQzucio3DomHCb4yzoXoyh/k11MZEPeX0MZH4XGepetYGB/D1jbGWcFkClJMBqEM1f26L NEd5g+VlDbyCmUrT85WdPs/tnlaaCRU= X-MC-Unique: QIigYv4FNPejSJWl7Kk6MA-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH v2 1/5] virtiofsd: Add notion of unprivileged mode Date: Thu, 30 Jul 2020 15:47:32 -0400 Message-Id: <20200730194736.173994-2-vgoyal@redhat.com> In-Reply-To: <20200730194736.173994-1-vgoyal@redhat.com> References: <20200730194736.173994-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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=205.139.110.61; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 03:41:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: berrange@redhat.com, vromanso@redhat.com, dwalsh@redhat.com, dgilbert@redhat.com, virtio-fs@redhat.com, stefanha@redhat.com, vgoyal@redhat.com 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" At startup if we are running as non-root user, then internally set unpriviliged mode set. Also add a notion of sandbox NONE and set that internally in unprivileged mode. setting up namespaces and chroot() fails in unpriviliged mode. Signed-off-by: Vivek Goyal --- tools/virtiofsd/passthrough_ll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index e2fbc614fd..cd91c4a831 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -147,11 +147,13 @@ enum { enum { SANDBOX_NAMESPACE, SANDBOX_CHROOT, + SANDBOX_NONE, }; =20 struct lo_data { pthread_mutex_t mutex; int sandbox; + bool unprivileged; int debug; int writeback; int flock; @@ -3288,6 +3290,12 @@ int main(int argc, char *argv[]) lo_map_init(&lo.dirp_map); lo_map_init(&lo.fd_map); =20 + if (geteuid() !=3D 0) { + lo.unprivileged =3D true; + lo.sandbox =3D SANDBOX_NONE; + fuse_log(FUSE_LOG_DEBUG, "Running in unprivileged passthrough mode.= \n"); + } + if (fuse_parse_cmdline(&args, &opts) !=3D 0) { goto err_out1; } --=20 2.25.4 From nobody Fri Apr 26 18:30:24 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=1596138716; cv=none; d=zohomail.com; s=zohoarc; b=Sp6Kc9thxT0JJ76nP3bOllUcIaAAsL3eUxSWltTZJlhfMicQHObxN89mUbKdmTIOmveEZ9TdkQiiiSA8DNKgmAs4yj+ESTRlgEzOQhPQXBVjcNZ6ktKyvSoDVrqgcnGOxzNM66s4Cj5pgMWD+MrGPOiI8StQfJfxzMrHUFrp8h4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596138716; 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=ecYC0oDUN6iehE9QTW6j0vyXiAs7Yphtol1U5+V4Lj0=; b=OgQUr8i68BM3shsrXfO+GCQZPjt8Qtc2gyUD1L9DaKP5LeoOguJ7awMMv9whVcaN1ffuhZ5lN3EDsvoaCHZOkwR0l6ExCz11pqkgrkC8RZpT+GEkE7uZjdCR2/U74okS8YTiMMmMrEEHx8QP6+/eT0WxS3ca9+Gx4fejvTA9qtI= 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 1596138716073343.2259970885233; Thu, 30 Jul 2020 12:51:56 -0700 (PDT) Received: from localhost ([::1]:51098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1Eao-0007Sq-HE for importer@patchew.org; Thu, 30 Jul 2020 15:51:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1EX7-0001o8-88 for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:32574 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1EX5-0006lP-KC for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:04 -0400 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-352-Scy43mYcNpCTxZhhh9v_jA-1; Thu, 30 Jul 2020 15:48:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 812CB1DE0 for ; Thu, 30 Jul 2020 19:47:59 +0000 (UTC) Received: from horse.redhat.com (ovpn-117-166.rdu2.redhat.com [10.10.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id D7E416111F; Thu, 30 Jul 2020 19:47:53 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 62C75223D05; Thu, 30 Jul 2020 15:47:48 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596138482; 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=ecYC0oDUN6iehE9QTW6j0vyXiAs7Yphtol1U5+V4Lj0=; b=FkpmqtkjjnlyzxYaSC1o1rGa/Ma4e4KfyHTTPxtG4zHXpSYcYcWd9iyimSaIs8G802j2N3 0HMpJG0OgMnQzvn+1sZPU+tao7WOia0gaKuPdZTodzp774jpTTRDLaWtkMztXJkG/az8fw WTQ46iJSiD/C0k67Xs0MLKvxPLkIZ8g= X-MC-Unique: Scy43mYcNpCTxZhhh9v_jA-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH v2 2/5] virtiofsd: create lock/pid file in per user cache dir Date: Thu, 30 Jul 2020 15:47:33 -0400 Message-Id: <20200730194736.173994-3-vgoyal@redhat.com> In-Reply-To: <20200730194736.173994-1-vgoyal@redhat.com> References: <20200730194736.173994-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=205.139.110.120; envelope-from=vgoyal@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 23:51:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: berrange@redhat.com, vromanso@redhat.com, dwalsh@redhat.com, dgilbert@redhat.com, virtio-fs@redhat.com, stefanha@redhat.com, vgoyal@redhat.com 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" Right now we create lock/pid file in /usr/local/var/... and unprivliged user does not have access to create files there. Hence, in unprivileged mode, create this file in per user cache dir as specified by environment variable XDG_RUNTIME_DIR. Signed-off-by: Vivek Goyal Reviewed-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_virtio.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 6b21a93841..1551a94757 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -972,8 +972,21 @@ static bool fv_socket_lock(struct fuse_session *se) g_autofree gchar *pidfile =3D NULL; g_autofree gchar *dir =3D NULL; Error *local_err =3D NULL; + gboolean unprivileged =3D false; =20 - dir =3D qemu_get_local_state_pathname("run/virtiofsd"); + if (geteuid() !=3D 0) + unprivileged =3D true; + + /* + * Unpriviliged users don't have access to /usr/local/var. Hence + * store lock/pid file in per user cache directory. Use environment + * variable XDG_RUNTIME_DIR. + */ + if (unprivileged) { + dir =3D g_strdup_printf("%s/virtiofsd", g_get_user_runtime_dir()); + } else { + dir =3D qemu_get_local_state_pathname("run/virtiofsd"); + } =20 if (g_mkdir_with_parents(dir, S_IRWXU) < 0) { fuse_log(FUSE_LOG_ERR, "%s: Failed to create directory %s: %s", --=20 2.25.4 From nobody Fri Apr 26 18:30:24 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=1596138537; cv=none; d=zohomail.com; s=zohoarc; b=NvQCO3czlOdMbnUBtB5I926oxfXN6+UsZOszEQubETRG+Ggc3fuG4s9hbvrDE+la4j2Cp/NO6AxHeDGoUPw1sjpYxvQ8oKTUNatBLNz5d6Xr/TDCtGF+uMoX0RF/GPAQ80KaJ6rWRHQDt3BETxPFWODxSKFLX4r7N2eEWfhJ82E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596138537; 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=cW1Fv6F+zfd8ts97DlbbgwPQ6AYGjGluPWGyzh4qrh8=; b=aefKkwOn8al5S9xQmRSjX+U8hAyQFY0xwfE2SFIipCHb21XKUIDfi9YZ2dHDBV2Cknqcu6DaWHI+GtreXYq8NXyKrtBG03LXOLWr1M3YIH+NPxp1z2C/o52ArJB+xFOYPTzi6TFzhN5rv1xJl24v4icj5k3qbCV+QRO3hG0avjY= 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 1596138537369680.110024835031; Thu, 30 Jul 2020 12:48:57 -0700 (PDT) Received: from localhost ([::1]:40402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1EXw-00032F-64 for importer@patchew.org; Thu, 30 Jul 2020 15:48:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1EX6-0001mr-IZ for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:04 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:33854 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1EX4-0006lK-PS for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:04 -0400 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-352-PAL2IvpsMVOyjob5ADIa4Q-1; Thu, 30 Jul 2020 15:48:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 94561101C8A0 for ; Thu, 30 Jul 2020 19:47:59 +0000 (UTC) Received: from horse.redhat.com (ovpn-117-166.rdu2.redhat.com [10.10.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF92061176; Thu, 30 Jul 2020 19:47:53 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 67470223D06; Thu, 30 Jul 2020 15:47:48 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596138482; 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=cW1Fv6F+zfd8ts97DlbbgwPQ6AYGjGluPWGyzh4qrh8=; b=cQyPH/2ljyS4+dgFILlhBZZS/xFKWo6xzxjPL9iAICpK1Mxg0x8tOsmCi6nohW7OrCg4EI bX6HigpTRHVlpAGauLnDUV0+JBVX9bRWhfYl+Y2dhySpOT49Bx/cYKk0doQffsBKPxCoSY MyWWzJWj6p/v7GsO0R5807J7ofCmUOs= X-MC-Unique: PAL2IvpsMVOyjob5ADIa4Q-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH v2 3/5] virtiofsd: open /proc/self/fd/ in sandbox=NONE mode Date: Thu, 30 Jul 2020 15:47:34 -0400 Message-Id: <20200730194736.173994-4-vgoyal@redhat.com> In-Reply-To: <20200730194736.173994-1-vgoyal@redhat.com> References: <20200730194736.173994-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=205.139.110.120; envelope-from=vgoyal@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 23:51:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: berrange@redhat.com, vromanso@redhat.com, dwalsh@redhat.com, dgilbert@redhat.com, virtio-fs@redhat.com, stefanha@redhat.com, vgoyal@redhat.com 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" We need /proc/self/fd descriptor even in sandbox=3DNONE mode. Signed-off-by: Vivek Goyal --- tools/virtiofsd/passthrough_ll.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index cd91c4a831..76ef891105 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2969,6 +2969,15 @@ static void setup_capabilities(char *modcaps_in) pthread_mutex_unlock(&cap.mutex); } =20 +static void setup_none(struct lo_data *lo) +{ + lo->proc_self_fd =3D open("/proc/self/fd", O_PATH); + if (lo->proc_self_fd =3D=3D -1) { + fuse_log(FUSE_LOG_ERR, "open(\"/proc/self/fd\", O_PATH): %m\n"); + exit(1); + } +} + /* * Use chroot as a weaker sandbox for environments where the process is * launched without CAP_SYS_ADMIN. @@ -3014,8 +3023,10 @@ static void setup_sandbox(struct lo_data *lo, struct= fuse_session *se, if (lo->sandbox =3D=3D SANDBOX_NAMESPACE) { setup_namespaces(lo, se); setup_mounts(lo->source); - } else { + } else if (lo->sandbox =3D=3D SANDBOX_CHROOT) { setup_chroot(lo); + } else { + setup_none(lo); } =20 setup_seccomp(enable_syslog); --=20 2.25.4 From nobody Fri Apr 26 18:30:24 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=1596138625; cv=none; d=zohomail.com; s=zohoarc; b=TxpAcYitHnwAqQzD+VFvbieS6exPfaoya7xBdGFbvPgAgWz4pGh/7E/oBwYi2Uay3p3nplpfSpm8Y3fsFPpANM/wOZhENm0JCiYSy4tqZTiGw2/3hU5UAlHAQ1YlFkpSjWNhpW/3xcGaT42kS1GwXF/h2EZW1LR+fOVJrBX+QPU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596138625; 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=jhjZBzKdUPWmQBoGYYNmaWrngqD0E272Oq6g881pzZA=; b=T5BPGvHDejVo0DmzbY5rWe4HEzA/+Ov7OmYtf0uKzNyyYjopFIz0/bOd1qJKoJ4WdMoamrpqaI/eoMORUs8FPPqNsff5VMKNEcvtR/w3p6LfqGxeAs1FSnEYO+aZL5vQE/mhJ8/hn0hkmLNjVZZg60mRSn1ah0KJGop39+F5pB4= 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 1596138625894889.9059320350085; Thu, 30 Jul 2020 12:50:25 -0700 (PDT) Received: from localhost ([::1]:46608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1EZM-0005Wq-NI for importer@patchew.org; Thu, 30 Jul 2020 15:50:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1EX7-0001no-3U for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:05 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50820 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1EX4-0006lL-RF for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:04 -0400 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-410-tsvrPN_aPUWBRm8FDFYhfA-1; Thu, 30 Jul 2020 15:48:00 -0400 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 C160F1932482 for ; Thu, 30 Jul 2020 19:47:59 +0000 (UTC) Received: from horse.redhat.com (ovpn-117-166.rdu2.redhat.com [10.10.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA72F19D7B; Thu, 30 Jul 2020 19:47:53 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 6BA52223D08; Thu, 30 Jul 2020 15:47:48 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596138482; 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=jhjZBzKdUPWmQBoGYYNmaWrngqD0E272Oq6g881pzZA=; b=NzpAVxxJ+CJJB8XrQ/3pi7I1O2Xe36HGJzYJa5J6eyLyBDMAptcqc8QxcR4RrkG9PlS3eg LUeIe6rNt3SS9GmON7Wu+12FXZNMvHZbSoKsTulLtNrr4t0tp3yDaq+2rNcGVuEZkD6GqG BVFUnpu0/AKO9K7pPygZHQF1jfkLH1k= X-MC-Unique: tsvrPN_aPUWBRm8FDFYhfA-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH v2 4/5] virtiofsd: Open lo->source while setting up root in sandbox=NONE mode Date: Thu, 30 Jul 2020 15:47:35 -0400 Message-Id: <20200730194736.173994-5-vgoyal@redhat.com> In-Reply-To: <20200730194736.173994-1-vgoyal@redhat.com> References: <20200730194736.173994-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=205.139.110.61; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 03:41:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: berrange@redhat.com, vromanso@redhat.com, dwalsh@redhat.com, dgilbert@redhat.com, virtio-fs@redhat.com, stefanha@redhat.com, vgoyal@redhat.com 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" In sandbox=3DNONE mode, lo->source points to the directory which is being exported. We have not done any chroot()/pivot_root(). So open lo->source. Signed-off-by: Vivek Goyal --- tools/virtiofsd/passthrough_ll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 76ef891105..a6fa816b6c 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -3209,7 +3209,10 @@ static void setup_root(struct lo_data *lo, struct lo= _inode *root) int fd, res; struct stat stat; =20 - fd =3D open("/", O_PATH); + if (lo->sandbox =3D=3D SANDBOX_NONE) + fd =3D open(lo->source, O_PATH); + else + fd =3D open("/", O_PATH); if (fd =3D=3D -1) { fuse_log(FUSE_LOG_ERR, "open(%s, O_PATH): %m\n", lo->source); exit(1); --=20 2.25.4 From nobody Fri Apr 26 18:30:24 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=1596138622; cv=none; d=zohomail.com; s=zohoarc; b=kfjjdmVswMXpCKiyFGfFr/lAOwOxrU9MJUYgpioBVQ1C6pf4D5ugg6NpTTFTtftuFPMjmKo3fvySgbXCRMPMoV/T7+ppctSM/aXelqo6wdYyYKL4tskb+DGBZ2ns3vrPZj+0sfYjIqdIFZ1mV7p6tpIS1+OLHt52zZzK+eXuoRI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596138622; 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=PaH6/prDe0zOnbw0p8530Sh7BSPAEfCKXw62zps8Fcw=; b=Paoj8AQGvV1p9EITZEKNxR76yjKU+f8f5uikjg9CAAs5tB7i/XSO9JM4TvCvHsya3PLB/3uk94mjNF9FmyQX8WXjUzGSE9wuqmzSLw92eHmkKB0qCGxSnKx44DOa99J730Ku9NUUXsyh1HV5a7E3QY3+x4fwlUjpeCjEwwNXYq0= 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 1596138622166208.88819471073236; Thu, 30 Jul 2020 12:50:22 -0700 (PDT) Received: from localhost ([::1]:46520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1EZI-0005Uk-RI for importer@patchew.org; Thu, 30 Jul 2020 15:50:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1EXA-0001uV-4Q for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:08 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:32056 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k1EX8-0006nQ-Gw for qemu-devel@nongnu.org; Thu, 30 Jul 2020 15:48:07 -0400 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-506-EYzzquMQPYmMbdvrSRlkPQ-1; Thu, 30 Jul 2020 15:48:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 851D4101C8A0 for ; Thu, 30 Jul 2020 19:48:01 +0000 (UTC) Received: from horse.redhat.com (ovpn-117-166.rdu2.redhat.com [10.10.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 055E05BAC3; Thu, 30 Jul 2020 19:47:56 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 6F4FD223D09; Thu, 30 Jul 2020 15:47:48 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596138485; 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=PaH6/prDe0zOnbw0p8530Sh7BSPAEfCKXw62zps8Fcw=; b=JqfDbsHI3gZp7mdod1aAZDep1y/AozSZJVND/aAlrYCqvzRj3UohxKGpcWF2PumhskuEhh ZgQTu7KuwKv5/fneq3/hJLFEsPjxDc6pbcfGdjCCEJ9xWChzZrEbC9y2Vqv8SvyRAVbdiV qCXNy0CiW66LYwggpCrC4wuGHQem5C0= X-MC-Unique: EYzzquMQPYmMbdvrSRlkPQ-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH v2 5/5] virtiofsd: Skip setup_capabilities() in sandbox=NONE mode Date: Thu, 30 Jul 2020 15:47:36 -0400 Message-Id: <20200730194736.173994-6-vgoyal@redhat.com> In-Reply-To: <20200730194736.173994-1-vgoyal@redhat.com> References: <20200730194736.173994-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=205.139.110.61; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/30 03:41:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, 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: berrange@redhat.com, vromanso@redhat.com, dwalsh@redhat.com, dgilbert@redhat.com, virtio-fs@redhat.com, stefanha@redhat.com, vgoyal@redhat.com 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" setup_capabilites() tries to give some of the required capabilities to act as a full fledged file server in priviliged mode. In unpriviliged mode we can't get those capabilities and setup_capabilities() will fail. So don't setup capabilities when sandbox=3DNONE. Signed-off-by: Vivek Goyal --- tools/virtiofsd/passthrough_ll.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index a6fa816b6c..1a0b24cbf2 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -3030,7 +3030,8 @@ static void setup_sandbox(struct lo_data *lo, struct = fuse_session *se, } =20 setup_seccomp(enable_syslog); - setup_capabilities(g_strdup(lo->modcaps)); + if (lo->sandbox !=3D SANDBOX_NONE) + setup_capabilities(g_strdup(lo->modcaps)); } =20 /* Set the maximum number of open file descriptors */ --=20 2.25.4