From nobody Sat Feb 7 15:35:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602698660; cv=none; d=zohomail.com; s=zohoarc; b=Y5mYc5tOS4DDv/x+RxjVlDTDjtWxaXMuXcRxoMRATRV2wrS11pn6ffXSp2mfi6NPSPJCdqrxztQiGPeKGattFWaVNjZFEf1LEx2X2xcumZ4WUAnhTSynzOD4P92VPMJWu8XW9K0SCGIcNLrrsBqDyLlTZ99GqXCCV/sLkeBVIRU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602698660; h=Content-Type:Content-Transfer-Encoding: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=TcFpzXSrk4RWtW0UvOW/XxU3RU348JJw5NrURzCJoKY=; b=i0fWLjUb1KBRxlc+9+sLnCHXRNbOPV0EkJgVmX7ltWWmtHwMBpC1VhIm2IqcIoiZCxd9kacD4Ns1ZpP3Drxs5YvZfkAXEZzmr8Zfo86W5eYu9zYDhmIY/j6pZ4C5pfkGCzd2joXc3INqZm3kN1ziA08ewu3MXkgJSJbRPx6KrLI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1602698660482605.5604712173134; Wed, 14 Oct 2020 11:04:20 -0700 (PDT) Received: from localhost ([::1]:36668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSl8N-0008Vd-KC for importer@patchew.org; Wed, 14 Oct 2020 14:04:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSl6e-0007DI-So for qemu-devel@nongnu.org; Wed, 14 Oct 2020 14:02:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kSl6d-0008FM-4L for qemu-devel@nongnu.org; Wed, 14 Oct 2020 14:02:32 -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-563-c6wZJt5_M0mUrbJBh0WBmA-1; Wed, 14 Oct 2020 14:02:27 -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 F1DED18BE16B for ; Wed, 14 Oct 2020 18:02:26 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-113-95.ams2.redhat.com [10.36.113.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 625226EF53; Wed, 14 Oct 2020 18:02:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602698550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TcFpzXSrk4RWtW0UvOW/XxU3RU348JJw5NrURzCJoKY=; b=AkCxoVBTcIbjpczOTedG9rC63aoWZtup+odQ2zZNGNtT0PEJUAwUnBvaRxMQe06xxAk8WY msDUFtcPEiDvkrSB3edcu2C9xBSTJ1NFY3JoF9t2RNWrc1x6yT85sPpLhpFQ7TmivTNiO+ XLyI0v0Wph3IRyZdm2laY47g1BEyZFU= X-MC-Unique: c6wZJt5_M0mUrbJBh0WBmA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com, dinechin@redhat.com, virtio-fs@redhat.com Subject: [PATCH v3 2/5] tools/virtiofsd: xattr name mappings: Map client xattr names Date: Wed, 14 Oct 2020 19:02:06 +0100 Message-Id: <20201014180209.49299-3-dgilbert@redhat.com> In-Reply-To: <20201014180209.49299-1-dgilbert@redhat.com> References: <20201014180209.49299-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-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=216.205.24.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/14 01:12:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Map xattr names originating at the client; from get/set/remove xattr. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/passthrough_ll.c | 101 ++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index f5a33014f9..57ebe17ed6 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2183,20 +2183,80 @@ static XattrMapEntry *parse_xattrmap(struct lo_data= *lo) return res; } =20 -static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name, +/* + * For use with getxattr/setxattr/removexattr, where the client + * gives us a name and we may need to choose a different one. + * Allocates a buffer for the result placing it in *out_name. + * If there's no change then *out_name is not set. + * Returns 0 on success + * Can return -EPERM to indicate we block a given attribute + * (in which case out_name is not allocated) + * Can return -ENOMEM to indicate out_name couldn't be allocated. + */ +static int xattr_map_client(const struct lo_data *lo, const char *client_n= ame, + char **out_name) +{ + const XattrMapEntry *cur_entry; + + for (cur_entry =3D lo->xattr_map_list; ; cur_entry++) { + if ((cur_entry->flags & XATTR_MAP_FLAG_CLIENT) && + (strstart(client_name, cur_entry->key, NULL))) { + if (cur_entry->flags & XATTR_MAP_FLAG_END_BAD) { + return -EPERM; + } + if (cur_entry->flags & XATTR_MAP_FLAG_END_OK) { + /* Unmodified name */ + return 0; + } + if (cur_entry->flags & XATTR_MAP_FLAG_PREFIX) { + *out_name =3D g_try_malloc(strlen(client_name) + + strlen(cur_entry->prepend) + 1); + if (!*out_name) { + return -ENOMEM; + } + sprintf(*out_name, "%s%s", cur_entry->prepend, client_name= ); + return 0; + } + } + } + + /* Shouldn't get here - rules should have an END_* */ + abort(); +} + +static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_nam= e, size_t size) { struct lo_data *lo =3D lo_data(req); char *value =3D NULL; char procname[64]; + const char *name; + char *mapped_name; struct lo_inode *inode; ssize_t ret; int saverr; int fd =3D -1; =20 + mapped_name =3D NULL; + name =3D in_name; + if (lo->xattrmap) { + ret =3D xattr_map_client(lo, in_name, &mapped_name); + if (ret < 0) { + if (ret =3D=3D -EPERM) { + ret =3D -ENODATA; + } + fuse_reply_err(req, -ret); + return; + } + if (mapped_name) { + name =3D mapped_name; + } + } + inode =3D lo_inode(req, ino); if (!inode) { fuse_reply_err(req, EBADF); + g_free(mapped_name); return; } =20 @@ -2261,6 +2321,7 @@ out_err: saverr =3D errno; out: fuse_reply_err(req, saverr); + g_free(mapped_name); goto out_free; } =20 @@ -2338,19 +2399,35 @@ out: goto out_free; } =20 -static void lo_setxattr(fuse_req_t req, fuse_ino_t ino, const char *name, +static void lo_setxattr(fuse_req_t req, fuse_ino_t ino, const char *in_nam= e, const char *value, size_t size, int flags) { char procname[64]; + const char *name; + char *mapped_name; struct lo_data *lo =3D lo_data(req); struct lo_inode *inode; ssize_t ret; int saverr; int fd =3D -1; =20 + mapped_name =3D NULL; + name =3D in_name; + if (lo->xattrmap) { + ret =3D xattr_map_client(lo, in_name, &mapped_name); + if (ret < 0) { + fuse_reply_err(req, -ret); + return; + } + if (mapped_name) { + name =3D mapped_name; + } + } + inode =3D lo_inode(req, ino); if (!inode) { fuse_reply_err(req, EBADF); + g_free(mapped_name); return; } =20 @@ -2385,21 +2462,38 @@ out: } =20 lo_inode_put(lo, &inode); + g_free(mapped_name); fuse_reply_err(req, saverr); } =20 -static void lo_removexattr(fuse_req_t req, fuse_ino_t ino, const char *nam= e) +static void lo_removexattr(fuse_req_t req, fuse_ino_t ino, const char *in_= name) { char procname[64]; + const char *name; + char *mapped_name; struct lo_data *lo =3D lo_data(req); struct lo_inode *inode; ssize_t ret; int saverr; int fd =3D -1; =20 + mapped_name =3D NULL; + name =3D in_name; + if (lo->xattrmap) { + ret =3D xattr_map_client(lo, in_name, &mapped_name); + if (ret < 0) { + fuse_reply_err(req, -ret); + return; + } + if (mapped_name) { + name =3D mapped_name; + } + } + inode =3D lo_inode(req, ino); if (!inode) { fuse_reply_err(req, EBADF); + g_free(mapped_name); return; } =20 @@ -2434,6 +2528,7 @@ out: } =20 lo_inode_put(lo, &inode); + g_free(mapped_name); fuse_reply_err(req, saverr); } =20 --=20 2.28.0