From nobody Wed Apr 24 01:40:30 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=1596061154; cv=none; d=zohomail.com; s=zohoarc; b=lTETVD3hDACaNiOFnjm5Yk9pDTqII/mPEIwnO3/xnrfCnxvZ8pGozooUh5YQJTOSV95EPmYR1IevTFHQxr82mRy2PLjb+plX6b4RLSgO+kW8HKUbJDvkNTeXLseEXw1yj50yv/2Nf3Ruh16axZ3qe+qRTACZTRlL+Wfh3PljIS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596061154; 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=aRoiGntPr/roRN7z30VYKhnG5GEpKOXqS3TTBjzQ2PQ=; b=joqPeszyBYCUO4SYKMuMjWu/CFuY6VdI9qH7cGFlW9IrzKDwanf+9ISiyNxHHZjw1uW4M+dpmLmkr7P4Y9oF3N9W0jO1tLGPeTVFLf2NodYMhBYogDMKwGpKdNTf8hdHHc05Jw1EUaQYq+LyLXyTZBBF/C8/O31f1owJrAM7jgk= 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 1596061154625146.57168113951946; Wed, 29 Jul 2020 15:19:14 -0700 (PDT) Received: from localhost ([::1]:37074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uPp-0003B9-1M for importer@patchew.org; Wed, 29 Jul 2020 18:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uLU-0003cj-MN for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24875 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 1k0uLR-0001Az-Qy for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:43 -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-325-DkppzhKjPAasRBiuTm0K9Q-1; Wed, 29 Jul 2020 18:14:38 -0400 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 D639C8015F4 for ; Wed, 29 Jul 2020 22:14:37 +0000 (UTC) Received: from horse.redhat.com (ovpn-116-149.rdu2.redhat.com [10.10.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F007712FF; Wed, 29 Jul 2020 22:14:32 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id C2020223D04; Wed, 29 Jul 2020 18:14:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596060880; 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=aRoiGntPr/roRN7z30VYKhnG5GEpKOXqS3TTBjzQ2PQ=; b=b3EBLdKBl9TZHGeimT8swq+HKLqDR8updg9GVW2XL15rftpS9i4TsKluXEgPoT3S25jlsT V1RLPd4t5OZbsppzMIuzRSxgjvicJW+s3N0nJFpA+7/ud/1ytsKAvgk1rksh7qRNP7kQPQ LZY38skadAINetrWgINLZX4KFsNI+1I= X-MC-Unique: DkppzhKjPAasRBiuTm0K9Q-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH 1/5] virtiofsd: Add notion of unprivileged mode Date: Wed, 29 Jul 2020 18:14:06 -0400 Message-Id: <20200729221410.147556-2-vgoyal@redhat.com> In-Reply-To: <20200729221410.147556-1-vgoyal@redhat.com> References: <20200729221410.147556-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=207.211.31.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 09:27:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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, 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 internall set unpriviliged mode set. Also add a notion of sandbox NONE and set that internally in unprivileged mode. setting up namespaces and chroot() fails when one does not have privileges. 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 Wed Apr 24 01:40:30 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=1596060960; cv=none; d=zohomail.com; s=zohoarc; b=ZlRA8kSUuNqOTc57VIkRY/aMZeUgWQJE5jYyETXq67B3DANhStLftx8OOGiqwrkr0FbPcpmqyah3Fp9iqNpb9oyA53OWGbX3IhuigmiVeBB9RCHL7DbgCtjVa9y+8XD5Avv9q6zKkbnU6mLWG4pZT6sK2hdMaH9XVTPstLm/q0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596060960; 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=yWt3zKX5kSTo4Po7yflNFrC7QnaOp+4ZYcdeS58v6Ig=; b=ShRDPTmXYPKNGm03vVOL8IJ6cF4uo+JaUb5FqXP0M0EvLRJbC59gtOnipN2HdN7/fsdkaBHs27U3vrO6ziLyzP92qVj8osItulNkY9Kkf2wRBr0JuuqKqXDRhbTY6LzP22UpPZBbSY6341fFX4bwVP40GAqLRzu38tAAUeUBMvI= 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 1596060960540787.289228424116; Wed, 29 Jul 2020 15:16:00 -0700 (PDT) Received: from localhost ([::1]:50064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uMh-0005Nt-7X for importer@patchew.org; Wed, 29 Jul 2020 18:15:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uLV-0003eB-7x for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:45 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:25758 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 1k0uLS-0001B0-9l for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:44 -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-328-qRVLW7a7OxGu3VEwcyv9Aw-1; Wed, 29 Jul 2020 18:14:38 -0400 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 D84FD102C7EC for ; Wed, 29 Jul 2020 22:14:37 +0000 (UTC) Received: from horse.redhat.com (ovpn-116-149.rdu2.redhat.com [10.10.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41EF775559; Wed, 29 Jul 2020 22:14:32 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id C8210223D05; Wed, 29 Jul 2020 18:14:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596060880; 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=yWt3zKX5kSTo4Po7yflNFrC7QnaOp+4ZYcdeS58v6Ig=; b=T4z/j33MlJOfxnjvYxOLRhkSEOy+DEO1DrcbK1iWKP+rdTikxS8F/iTa+3D0VK8cBqAJAZ tt/XTk3k8LIRgEVwdBMkXqBLZGQtrH882INfSsi5SkNOTHcjw4oWYUZ+5Q4kdlxMT3G45u K4l680OjrLCAXpXPgHS+mWeS3IyHBR0= X-MC-Unique: qRVLW7a7OxGu3VEwcyv9Aw-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH 2/5] virtiofsd: create lock/pid file in per user cache dir Date: Wed, 29 Jul 2020 18:14:07 -0400 Message-Id: <20200729221410.147556-3-vgoyal@redhat.com> In-Reply-To: <20200729221410.147556-1-vgoyal@redhat.com> References: <20200729221410.147556-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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/29 09:18:45 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, 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. So create this file in per user cache dir as queried as specified by environment variable XDG_RUNTIME_DIR. Note: "su $USER" does not update XDG_RUNTIME_DIR and it still points to root user's director. So for now I create a directory /tmp/$UID to save lock/pid file. Dan pointed out that it can be a problem if a malicious app already has /tmp/$UID created. So we probably need to get rid of this. Signed-off-by: Vivek Goyal --- tools/virtiofsd/fuse_virtio.c | 40 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 6b21a93841..f763a70ba5 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -972,13 +972,43 @@ 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; =20 - if (g_mkdir_with_parents(dir, S_IRWXU) < 0) { - fuse_log(FUSE_LOG_ERR, "%s: Failed to create directory %s: %s", - __func__, dir, strerror(errno)); - return false; + /* + * Unpriviliged users don't have access to /usr/local/var. Hence + * store lock/pid file in per user directory. Use environment + * variable XDG_RUNTIME_DIR. + * If one logs into the system as root and then does "su" then + * XDG_RUNTIME_DIR still points to root user directory. In that + * case create a directory for user in /tmp/$UID + */ + if (unprivileged) { + gchar *user_dir =3D NULL; + gboolean create_dir =3D false; + user_dir =3D g_strdup(g_get_user_runtime_dir()); + if (!user_dir || g_str_has_suffix(user_dir, "/0")) { + user_dir =3D g_strdup_printf("/tmp/%d", geteuid()); + create_dir =3D true; + } + + if (create_dir && g_mkdir_with_parents(user_dir, S_IRWXU) < 0) { + fuse_log(FUSE_LOG_ERR, "%s: Failed to create directory %s: %s", + __func__, user_dir, strerror(errno)); + g_free(user_dir); + return false; + } + dir =3D g_strdup(user_dir); + g_free(user_dir); + } else { + dir =3D qemu_get_local_state_pathname("run/virtiofsd"); + if (g_mkdir_with_parents(dir, S_IRWXU) < 0) { + fuse_log(FUSE_LOG_ERR, "%s: Failed to create directory %s: %s", + __func__, dir, strerror(errno)); + return false; + } } =20 sk_name =3D g_strdup(se->vu_socket_path); --=20 2.25.4 From nobody Wed Apr 24 01:40:30 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=1596061065; cv=none; d=zohomail.com; s=zohoarc; b=mDen9sI7/eNJF0Dl9m9vCeUqXT5JGPunaNt1HbEdWAT1Hr9wxtHoUkd7KQGiz6zzSkHkVzJDFqBhgvUA1WtWpxMlukhStX5NvbQTjloUIOptQgxtdOX0NxQti3J8ZvMn3attroSIE8a5tWnnpN+yXeB/Z1g3xdgGuwKFsQedb0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596061065; 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=BLtSnpIvVJuLXjkpJFS7JJra2+Of/xzvcITnJbXtFgI3gtZjqZzZ6X1vzgBJLiqwX6yXu2K184AV5mVFom9GEJUGwWIipzf8esnJXq80J9pwTtnNJSUsE744vHfsr4fXeZDQ8C9al1IAY0oNmyxhdkj5JU9OU1XouPejN4YIcGQ= 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 1596061065671234.36853696667697; Wed, 29 Jul 2020 15:17:45 -0700 (PDT) Received: from localhost ([::1]:58414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uOO-0000Ow-AQ for importer@patchew.org; Wed, 29 Jul 2020 18:17:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uLV-0003eu-Ot for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:45 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:34041 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 1k0uLS-0001B2-E3 for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:45 -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-497-vlZ7nJAQMDaErwEzaI8RoQ-1; Wed, 29 Jul 2020 18:14:38 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E7FF458 for ; Wed, 29 Jul 2020 22:14:37 +0000 (UTC) Received: from horse.redhat.com (ovpn-116-149.rdu2.redhat.com [10.10.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4631710013C4; Wed, 29 Jul 2020 22:14:32 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id CCC32223D06; Wed, 29 Jul 2020 18:14:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596060880; 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=V7584BNV5ZHaQErY4Pu0opiK/IVxiQCqnb4R6C7Fpz9izO4FeRhSVTnzMVMPWtzMee3r8d LdH/4SOlUPnWCSQgZ59LpQ/E8hgI7x06G37KHbi4oKt6To4YzoH8xKxRmkXg2rFLK6kEis oM4xZMeJx1a0PCS+GWR1P5GAblt2Bfo= X-MC-Unique: vlZ7nJAQMDaErwEzaI8RoQ-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH 3/5] virtiofsd: open /proc/self/fd/ in sandbox=NONE mode Date: Wed, 29 Jul 2020 18:14:08 -0400 Message-Id: <20200729221410.147556-4-vgoyal@redhat.com> In-Reply-To: <20200729221410.147556-1-vgoyal@redhat.com> References: <20200729221410.147556-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=207.211.31.81; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 13:17:39 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, 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 Wed Apr 24 01:40:30 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=1596061157; cv=none; d=zohomail.com; s=zohoarc; b=W1vtC5lGGBCvVIUawugrNjeGr9QHvYBxFnC9Zc/tJoNbJEom2rfHADRZElFOMN9gWunu1cBWhqYNTNR+RZ3ZQ38BX9uH/TWaAQTpz7xEWRZSCkdHvEX1QmQ6mtegf0PqThk0Y2wIU85kJS1truT3xeTtSD+D8IBqhEbYe9IdT14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596061157; 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=G+aIISLjyaut5q4GLbl2m6+SDYq2y1Ov0dKHpEVQYG+Q9E3UXb4FeKooXRwO6yVCvMd93n2uUZaWtYvyezrqCNe8ZaHsjQT60L2uU0o7vf0sWthQQPPnNgYfPAIFsrA+exV+cXRDiB73h77iID2ETENfrDz4TgELyKf5J1VAiaQ= 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 159606115744128.02810912114694; Wed, 29 Jul 2020 15:19:17 -0700 (PDT) Received: from localhost ([::1]:37324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uPs-0003IX-6Q for importer@patchew.org; Wed, 29 Jul 2020 18:19:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uLV-0003eh-KB for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:45 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41367 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 1k0uLS-0001B1-BE for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:45 -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-302-rQpeOYq-ObySeWVV-Vg0BA-1; Wed, 29 Jul 2020 18:14:38 -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 0D5C959 for ; Wed, 29 Jul 2020 22:14:38 +0000 (UTC) Received: from horse.redhat.com (ovpn-116-149.rdu2.redhat.com [10.10.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F9971DB; Wed, 29 Jul 2020 22:14:32 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id D090D223D08; Wed, 29 Jul 2020 18:14:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596060880; 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=Ho444FRQkwAr264d9A0hYBt09+WzksEIw3DSNR5y+iZDns+Ad8ErFi3g4myqm2GVJU55gM nQ7mPcedSC63omr8g28jLv8WVlR/QJrhbGt7YlfaW9YWXoETd5CnyFjtI5XHu00hPq2Uef uCIZGTjyzrxaOQkJORtr/AFvhtXLNxs= X-MC-Unique: rQpeOYq-ObySeWVV-Vg0BA-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH 4/5] virtiofsd: Open lo->source while setting up root in sandbox=NONE mode Date: Wed, 29 Jul 2020 18:14:09 -0400 Message-Id: <20200729221410.147556-5-vgoyal@redhat.com> In-Reply-To: <20200729221410.147556-1-vgoyal@redhat.com> References: <20200729221410.147556-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/29 09:18:45 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, 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 Wed Apr 24 01:40:30 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=1596061066; cv=none; d=zohomail.com; s=zohoarc; b=LaGKA+1fMgad4ojWdPIXviJ5lLeXSILM4H6LQetpH+AuxsPDouVKi0UiDOgsWvZarFhXTNQXLDlxMhpau8Ro2IKgQ9GDh5DBBDei4f+iAxiiFowkuA01W4k9VvUugovj/48nQcIGLo8bt6XgPj4o+CJ1TNuU8BlV7XHjJlESkhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596061066; 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=1WfN8++UZGyDXNo71dKABhAAZDe/VRBdRr0p8J5WuX0=; b=AkfFasYGTQf9/Rpp+0qp01MCewm517ZcCQxGQd2Me4TDt+Kcq7QRVv4aB0A2xN9WHl819ZHVgMto+R24GNKCbETsyxx/HltQfX8+BTh2t6LVdIncUabuCw59NZr5Z7uFUyQGEsFaXi30t0gFF+qGV2GePKb410nVPffMCy0hrC0= 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 1596061066841390.42902283616843; Wed, 29 Jul 2020 15:17:46 -0700 (PDT) Received: from localhost ([::1]:58556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uOP-0000SM-LV for importer@patchew.org; Wed, 29 Jul 2020 18:17:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0uLZ-0003lv-0P for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56487 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 1k0uLX-0001C0-As for qemu-devel@nongnu.org; Wed, 29 Jul 2020 18:14:48 -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-130-3xoQ3I2MNOmslZpEyI2tcQ-1; Wed, 29 Jul 2020 18:14:44 -0400 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 0797F1893DC7 for ; Wed, 29 Jul 2020 22:14:44 +0000 (UTC) Received: from horse.redhat.com (ovpn-116-149.rdu2.redhat.com [10.10.116.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C39A5F7D8; Wed, 29 Jul 2020 22:14:38 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id D4B9C223D09; Wed, 29 Jul 2020 18:14:31 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596060886; 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=1WfN8++UZGyDXNo71dKABhAAZDe/VRBdRr0p8J5WuX0=; b=dSCgztjhfYVSc7nhzYt7pJ2RCoHZbz6Bw0qzFs2bAcvZ87AU5XpfIlUATXvemQv2Sahb39 aAYmZFXXM643M1g6PPI4YoZ3WATEozG0IM4mJc3eNJwfy6uoDqshuIS7vSs9rGwnKUFR8M 5aUjKkE1Sz4H/dwJ983ZUr4mTZsUAto= X-MC-Unique: 3xoQ3I2MNOmslZpEyI2tcQ-1 From: Vivek Goyal To: qemu-devel@nongnu.org Subject: [PATCH 5/5] virtiofsd: Skip setup_capabilities() in sandbox=NONE mode Date: Wed, 29 Jul 2020 18:14:10 -0400 Message-Id: <20200729221410.147556-6-vgoyal@redhat.com> In-Reply-To: <20200729221410.147556-1-vgoyal@redhat.com> References: <20200729221410.147556-1-vgoyal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 09:17: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, 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" While running as unpriviliged user setup_capabilities() fails for me. So we are doing some operation which requires priviliges. For now simply skip it in sandbox=3DNONE mode. 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