From patchwork Wed Jul 29 22:14:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Goyal X-Patchwork-Id: 277273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53BFBC433E0 for ; Wed, 29 Jul 2020 22:19:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1AB8720656 for ; Wed, 29 Jul 2020 22:19:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="b3EBLdKB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1AB8720656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uPl-0003B9-C4 for qemu-devel@archiver.kernel.org; Wed, 29 Jul 2020 18:19:09 -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 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= 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 X-MC-Unique: DkppzhKjPAasRBiuTm0K9Q-1 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) 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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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, }; 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); + if (geteuid() != 0) { + lo.unprivileged = true; + lo.sandbox = SANDBOX_NONE; + fuse_log(FUSE_LOG_DEBUG, "Running in unprivileged passthrough mode.\n"); + } + if (fuse_parse_cmdline(&args, &opts) != 0) { goto err_out1; } From patchwork Wed Jul 29 22:14:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Goyal X-Patchwork-Id: 277274 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98F16C433E0 for ; Wed, 29 Jul 2020 22:17:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60D1720656 for ; Wed, 29 Jul 2020 22:17:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="V7584BNV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60D1720656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0uOJ-0000Ow-MF for qemu-devel@archiver.kernel.org; Wed, 29 Jul 2020 18:17:39 -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 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= 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 X-MC-Unique: vlZ7nJAQMDaErwEzaI8RoQ-1 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) 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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We need /proc/self/fd descriptor even in sandbox=NONE 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); } +static void setup_none(struct lo_data *lo) +{ + lo->proc_self_fd = open("/proc/self/fd", O_PATH); + if (lo->proc_self_fd == -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 == SANDBOX_NAMESPACE) { setup_namespaces(lo, se); setup_mounts(lo->source); - } else { + } else if (lo->sandbox == SANDBOX_CHROOT) { setup_chroot(lo); + } else { + setup_none(lo); } setup_seccomp(enable_syslog);