From nobody Mon Feb 9 00:01:37 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=1603473495; cv=none; d=zohomail.com; s=zohoarc; b=JioTN98RK+vI9PoQgPcf9CdcM1q5TI7ViyMGol4MPSh6S6Wsk6svKNkkpzNu7OOKRqBzwqLx7U5n3mm+f+DsxF6yta9ciT6k8MYzZGQY0/4nnyaQ4UW59ecBiJeD+zmJ59aCmfKzMqJoU05350stCcDa6XE2jV6ASNmFtCzn21U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603473495; 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=gDwvzkFNIweZmShw1wlRU7uHBoUQJTTBSzbW+CLl6CM=; b=aYem7kjilRlJmgSj6WbO8cB720ZAY5Wys6Y80q/tAgkTkg1MW68wCKe/LC2fC2tmBQ2z/fZbJytdEFitGCtd160lidANBIqw+b3Zgdzm9wZqK7ldNHRcb92+9njnGyEQFu9mUt/ak4pFfZ068BeqO5XpPJiVpgkM1VodYEJVTng= 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 1603473495053402.3328248146564; Fri, 23 Oct 2020 10:18:15 -0700 (PDT) Received: from localhost ([::1]:38952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kW0hh-0003Tc-SG for importer@patchew.org; Fri, 23 Oct 2020 13:18:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kW0On-0001Le-Fm for qemu-devel@nongnu.org; Fri, 23 Oct 2020 12:58:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kW0Oi-0005AE-Ie for qemu-devel@nongnu.org; Fri, 23 Oct 2020 12:58:41 -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-593-jfg-zVE4PgSounPqtOUYmw-1; Fri, 23 Oct 2020 12:58:31 -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 07D45804B7A for ; Fri, 23 Oct 2020 16:58:30 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-113-212.ams2.redhat.com [10.36.113.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id C628E10013D7; Fri, 23 Oct 2020 16:58:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603472312; 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=gDwvzkFNIweZmShw1wlRU7uHBoUQJTTBSzbW+CLl6CM=; b=TV/xjn/v1APmMflUlLk8f2FaIBkoZX4C+GloCF0ZvPx9u+tty/DBqdNIkCKtPU0hAjpbDT VdsfU0qev/3Dy6eOAfQ2McLKscHDesvbyRFsh7Oo+aB9Ax4GwXtmbXocUMOhC8cVR82lb+ Q1QviIpDrPJnFL5mbGZV4Mo6TqlfR2c= X-MC-Unique: jfg-zVE4PgSounPqtOUYmw-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 v4 3/5] tools/virtiofsd: xattr name mappings: Map server xattr names Date: Fri, 23 Oct 2020 17:58:10 +0100 Message-Id: <20201023165812.36028-4-dgilbert@redhat.com> In-Reply-To: <20201023165812.36028-1-dgilbert@redhat.com> References: <20201023165812.36028-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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/23 01:44:00 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 coming from the server, i.e. the host filesystem; currently this is only from listxattr. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/passthrough_ll.c | 90 ++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index ec3ef7b50d..57f584ee49 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2217,6 +2217,44 @@ static int xattr_map_client(const struct lo_data *lo= , const char *client_name, return -EPERM; } =20 +/* + * For use with listxattr where the server fs gives us a name and we may n= eed + * to sanitize this for the client. + * Returns a pointer to the result in *out_name + * This is always the original string or the current string with some pr= efix + * removed; no reallocation is done. + * Returns 0 on success + * Can return -ENODATA to indicate the name should be dropped from the lis= t. + */ +static int xattr_map_server(const struct lo_data *lo, const char *server_n= ame, + const char **out_name) +{ + size_t i; + const char *end; + + for (i =3D 0; i < lo->xattr_map_nentries; i++) { + const XattrMapEntry *cur_entry =3D lo->xattr_map_list + i; + + if ((cur_entry->flags & XATTR_MAP_FLAG_SERVER) && + (strstart(server_name, cur_entry->prepend, &end))) { + if (cur_entry->flags & XATTR_MAP_FLAG_BAD) { + return -ENODATA; + } + if (cur_entry->flags & XATTR_MAP_FLAG_OK) { + *out_name =3D server_name; + return 0; + } + if (cur_entry->flags & XATTR_MAP_FLAG_PREFIX) { + /* Remove prefix */ + *out_name =3D end; + return 0; + } + } + } + + return -ENODATA; +} + static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_nam= e, size_t size) { @@ -2371,8 +2409,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t = ino, size_t size) if (ret =3D=3D 0) { goto out; } + + if (lo->xattr_map_list) { + /* + * Map the names back, some attributes might be dropped, + * some shortened, but not increased, so we shouldn't + * run out of room. + */ + size_t out_index, in_index; + out_index =3D 0; + in_index =3D 0; + while (in_index < ret) { + const char *map_out; + char *in_ptr =3D value + in_index; + /* Length of current attribute name */ + size_t in_len =3D strlen(value + in_index) + 1; + + int mapret =3D xattr_map_server(lo, in_ptr, &map_out); + if (mapret !=3D -ENODATA && mapret !=3D 0) { + /* Shouldn't happen */ + saverr =3D -mapret; + goto out; + } + if (mapret =3D=3D 0) { + /* Either unchanged, or truncated */ + size_t out_len; + if (map_out !=3D in_ptr) { + /* +1 copies the NIL */ + out_len =3D strlen(map_out) + 1; + } else { + /* No change */ + out_len =3D in_len; + } + /* + * Move result along, may still be needed for an uncha= nged + * entry if a previous entry was changed. + */ + memmove(value + out_index, map_out, out_len); + + out_index +=3D out_len; + } + in_index +=3D in_len; + } + ret =3D out_index; + if (ret =3D=3D 0) { + goto out; + } + } fuse_reply_buf(req, value, ret); } else { + /* + * xattrmap only ever shortens the result, + * so we don't need to do anything clever with the + * allocation length here. + */ fuse_reply_xattr(req, ret); } out_free: --=20 2.28.0