From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.1 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,URIBL_BLOCKED,USER_AGENT_SANE_1 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 C9F4AC4727E for ; Wed, 7 Oct 2020 10:49:32 +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 2BFFB20870 for ; Wed, 7 Oct 2020 10:49:32 +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="SrcAbS4d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BFFB20870 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]:60560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQ70l-0001dg-2g for qemu-devel@archiver.kernel.org; Wed, 07 Oct 2020 06:49:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQ6za-0000l2-44 for qemu-devel@nongnu.org; Wed, 07 Oct 2020 06:48:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQ6zY-0001Ca-2k for qemu-devel@nongnu.org; Wed, 07 Oct 2020 06:48:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602067695; 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=ya6O5cqck50WgGNUT5w2qYKSjg7Ab2CofO7s+gDR1Hk=; b=SrcAbS4dqjU7VO7IkzVhNBjiX/fXERkEVYRkgORgE7O8xfPNsjZe/rQf4oc6n2tm16upBC e6oiiaOg+OEniV/4KryAlGm95Z8U4g839QOt6fjoR6i1exbnOOwFMxiP4CXF57YHD1WhEq eSvodPkOKOel1wSy5ft7KJv2MnJbD40= 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-474-1DK8heIuM4eNb_aMJAorLA-1; Wed, 07 Oct 2020 06:48:11 -0400 X-MC-Unique: 1DK8heIuM4eNb_aMJAorLA-1 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 19A09420F0; Wed, 7 Oct 2020 10:48:09 +0000 (UTC) Received: from work-vm (ovpn-112-50.ams2.redhat.com [10.36.112.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBF7C5C1BD; Wed, 7 Oct 2020 10:48:02 +0000 (UTC) Date: Wed, 7 Oct 2020 11:48:00 +0100 From: "Dr. David Alan Gilbert" To: Alex =?iso-8859-1?Q?Benn=E9e?= Subject: Re: [RFC PATCH 01/19] tools/virtiofsd: add support for --socket-group Message-ID: <20201007104800.GB3085@work-vm> References: <20200925125147.26943-1-alex.bennee@linaro.org> <20200925125147.26943-2-alex.bennee@linaro.org> MIME-Version: 1.0 In-Reply-To: <20200925125147.26943-2-alex.bennee@linaro.org> User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 00:44:56 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.733, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: jean-philippe@linaro.org, maxim.uvarov@linaro.org, bing.zhu@intel.com, Matti.Moell@opensynergy.com, virtualization@lists.linuxfoundation.org, ilias.apalodimas@linaro.org, qemu-devel@nongnu.org, arnd@linaro.org, hmo@opensynergy.com, takahiro.akashi@linaro.org, Stefan Hajnoczi , joakim.bech@linaro.org, stratos-dev@op-lists.linaro.org, tomas.winkler@intel.com, yang.huang@intel.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Alex Bennée (alex.bennee@linaro.org) wrote: > If you like running QEMU as a normal user (very common for TCG runs) > but you have to run virtiofsd as a root user you run into connection > problems. Adding support for an optional --socket-group allows the > users to keep using the command line. > > Signed-off-by: Alex Bennée > Reviewed-by: Stefan Hajnoczi Queued > --- > v1 > - tweak documentation and commentary > --- > docs/tools/virtiofsd.rst | 4 ++++ > tools/virtiofsd/fuse_i.h | 1 + > tools/virtiofsd/fuse_lowlevel.c | 6 ++++++ > tools/virtiofsd/fuse_virtio.c | 20 ++++++++++++++++++-- > 4 files changed, 29 insertions(+), 2 deletions(-) > > diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst > index e33c81ed41f1..085f9b12a6a3 100644 > --- a/docs/tools/virtiofsd.rst > +++ b/docs/tools/virtiofsd.rst > @@ -87,6 +87,10 @@ Options > > Listen on vhost-user UNIX domain socket at PATH. > > +.. option:: --socket-group=GROUP > + > + Set the vhost-user UNIX domain socket gid to GROUP. > + > .. option:: --fd=FDNUM > > Accept connections from vhost-user UNIX domain socket file descriptor FDNUM. > diff --git a/tools/virtiofsd/fuse_i.h b/tools/virtiofsd/fuse_i.h > index 1240828208ab..492e002181e2 100644 > --- a/tools/virtiofsd/fuse_i.h > +++ b/tools/virtiofsd/fuse_i.h > @@ -68,6 +68,7 @@ struct fuse_session { > size_t bufsize; > int error; > char *vu_socket_path; > + char *vu_socket_group; > int vu_listen_fd; > int vu_socketfd; > struct fv_VuDev *virtio_dev; > diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c > index 2dd36ec03b6e..4d1ba2925d1b 100644 > --- a/tools/virtiofsd/fuse_lowlevel.c > +++ b/tools/virtiofsd/fuse_lowlevel.c > @@ -2523,6 +2523,7 @@ static const struct fuse_opt fuse_ll_opts[] = { > LL_OPTION("--debug", debug, 1), > LL_OPTION("allow_root", deny_others, 1), > LL_OPTION("--socket-path=%s", vu_socket_path, 0), > + LL_OPTION("--socket-group=%s", vu_socket_group, 0), > LL_OPTION("--fd=%d", vu_listen_fd, 0), > LL_OPTION("--thread-pool-size=%d", thread_pool_size, 0), > FUSE_OPT_END > @@ -2630,6 +2631,11 @@ struct fuse_session *fuse_session_new(struct fuse_args *args, > "fuse: --socket-path and --fd cannot be given together\n"); > goto out4; > } > + if (se->vu_socket_group && !se->vu_socket_path) { > + fuse_log(FUSE_LOG_ERR, > + "fuse: --socket-group can only be used with --socket-path\n"); > + goto out4; > + } > > se->bufsize = FUSE_MAX_MAX_PAGES * getpagesize() + FUSE_BUFFER_HEADER_SIZE; > > diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c > index 9e5537506c16..7942d3d11a87 100644 > --- a/tools/virtiofsd/fuse_virtio.c > +++ b/tools/virtiofsd/fuse_virtio.c > @@ -31,6 +31,8 @@ > #include > #include > #include > +#include > +#include > #include > > #include "contrib/libvhost-user/libvhost-user.h" > @@ -924,15 +926,29 @@ static int fv_create_listen_socket(struct fuse_session *se) > > /* > * Unfortunately bind doesn't let you set the mask on the socket, > - * so set umask to 077 and restore it later. > + * so set umask appropriately and restore it later. > */ > - old_umask = umask(0077); > + if (se->vu_socket_group) { > + old_umask = umask(S_IROTH | S_IWOTH | S_IXOTH); > + } else { > + old_umask = umask(S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH); > + } > if (bind(listen_sock, (struct sockaddr *)&un, addr_len) == -1) { > fuse_log(FUSE_LOG_ERR, "vhost socket bind: %m\n"); > close(listen_sock); > umask(old_umask); > return -1; > } > + if (se->vu_socket_group) { > + struct group *g = getgrnam(se->vu_socket_group); > + if (g) { > + if (!chown(se->vu_socket_path, -1, g->gr_gid)) { > + fuse_log(FUSE_LOG_WARNING, > + "vhost socket failed to set group to %s (%d)\n", > + se->vu_socket_group, g->gr_gid); > + } > + } > + } > umask(old_umask); > > if (listen(listen_sock, 1) == -1) { > -- > 2.20.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK