From patchwork Thu Jul 30 19:47:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivek Goyal X-Patchwork-Id: 277228 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 D7F84C433E0 for ; Thu, 30 Jul 2020 19:51:52 +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 9FA9C2070B for ; Thu, 30 Jul 2020 19:51:52 +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="Fkpmqtkj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FA9C2070B 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]:51098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1Eal-0007Sq-St for qemu-devel@archiver.kernel.org; Thu, 30 Jul 2020 15:51:51 -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 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= 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 X-MC-Unique: Scy43mYcNpCTxZhhh9v_jA-1 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) 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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 = NULL; g_autofree gchar *dir = NULL; Error *local_err = NULL; + gboolean unprivileged = false; - dir = qemu_get_local_state_pathname("run/virtiofsd"); + if (geteuid() != 0) + unprivileged = 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 = g_strdup_printf("%s/virtiofsd", g_get_user_runtime_dir()); + } else { + dir = 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",