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=-9.6 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 F2E33C41604 for ; Tue, 6 Oct 2020 16:26:35 +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 887E7206CB for ; Tue, 6 Oct 2020 16:26:35 +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="KQKbcZPh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 887E7206CB 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]:50402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPpnO-0003xK-Fj for qemu-devel@archiver.kernel.org; Tue, 06 Oct 2020 12:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPpfG-0004MO-TF for qemu-devel@nongnu.org; Tue, 06 Oct 2020 12:18:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55767) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kPpfC-0005kj-P9 for qemu-devel@nongnu.org; Tue, 06 Oct 2020 12:18:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602001086; 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: in-reply-to:in-reply-to:references:references; bh=UBIh1KxVCgs8thAVtp8ZziBWZOOJWHCFCUlbK838fME=; b=KQKbcZPhT2WkAnLCsTuTp5/BFfF5MgiDEMyav0sQvoR0McqJo1JEC7gYaw1QEeJmIdbxtN pY22S90X0Aqw+0ZuKjHTBAa5pQCMuu8jcMI193e5E8n9qgrdmz5qj02L8VNb1oBZ4ssear X18cEqadQu6vLfk4bQQnKeFnG7+AYkk= 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-429-1ZZ5XsWWOzmhE5juNYjQuA-1; Tue, 06 Oct 2020 12:18:04 -0400 X-MC-Unique: 1ZZ5XsWWOzmhE5juNYjQuA-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 A02F51019624 for ; Tue, 6 Oct 2020 16:18:02 +0000 (UTC) Received: from titinator (ovpn-115-5.ams2.redhat.com [10.36.115.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 94CD476644; Tue, 6 Oct 2020 16:17:54 +0000 (UTC) References: <20200827153657.111098-1-dgilbert@redhat.com> <20200827153657.111098-6-dgilbert@redhat.com> User-agent: mu4e 1.5.2; emacs 26.3 From: Christophe de Dinechin To: "Dr. David Alan Gilbert \(git\)" Subject: Re: [PATCH v2 5/6] tools/virtiofsd: xattr name mappings: Map server xattr names In-reply-to: <20200827153657.111098-6-dgilbert@redhat.com> Date: Tue, 06 Oct 2020 18:17:51 +0200 Message-ID: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dinechin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=dinechin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/06 00:55:20 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_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: , Cc: virtio-fs@redhat.com, stefanha@redhat.com, vgoyal@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote... > 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 > --- > tools/virtiofsd/passthrough_ll.c | 88 ++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > index 9b9c8f3ab1..7cd99186f7 100644 > --- a/tools/virtiofsd/passthrough_ll.c > +++ b/tools/virtiofsd/passthrough_ll.c > @@ -2188,6 +2188,42 @@ static int xattr_map_client(const char *client_name, char **out_name) > abort(); > } > > +/* > + * For use with listxattr where the server fs gives us a name and we may need > + * 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 prefix > + * removed; no reallocation is done. > + * Returns 0 on success > + * Can return -ENODATA to indicate the name should be dropped from the list. > + */ > +static int xattr_map_server(const char *server_name, const char **out_name) > +{ > + const XattrMapEntry *cur_entry; > + for (cur_entry = xattr_map_list; ; cur_entry++) { > + if ((cur_entry->flags & XATTR_MAP_FLAG_SERVER) && > + (!strncmp(cur_entry->prepend, > + server_name, > + strlen(cur_entry->prepend)))) { Overall, the same remarks apply as for the client side. > + if (cur_entry->flags & XATTR_MAP_FLAG_END_BAD) { > + return -ENODATA; > + } > + if (cur_entry->flags & XATTR_MAP_FLAG_END_OK) { > + *out_name = server_name; > + return 0; > + } > + if (cur_entry->flags & XATTR_MAP_FLAG_PREFIX) { > + /* Remove prefix */ > + *out_name = server_name + strlen(cur_entry->prepend); > + 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_name, > size_t size) > { > @@ -2342,8 +2378,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) > if (ret == 0) { > goto out; > } > + > + if (lo->xattrmap) { > + /* > + * 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 = 0; > + in_index = 0; > + while (in_index < ret) { > + const char *map_out; > + char *in_ptr = value + in_index; > + /* Length of current attribute name */ > + size_t in_len = strlen(value + in_index) + 1; > + > + int mapret = xattr_map_server(in_ptr, &map_out); > + if (mapret != -ENODATA && mapret != 0) { > + /* Shouldn't happen */ > + saverr = -mapret; > + goto out; > + } > + if (mapret == 0) { > + /* Either unchanged, or truncated */ > + size_t out_len; > + if (map_out != in_ptr) { > + /* +1 copies the NIL */ > + out_len = strlen(map_out) + 1; > + } else { > + /* No change */ > + out_len = in_len; > + } > + /* > + * Move result along, may still be needed for an unchanged > + * entry if a previous entry was changed. > + */ > + memmove(value + out_index, map_out, out_len); > + > + out_index += out_len; > + } > + in_index += in_len; > + } > + ret = out_index; > + if (ret == 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: -- Cheers, Christophe de Dinechin (IRC c3d) From mboxrd@z Thu Jan 1 00:00:00 1970 References: <20200827153657.111098-1-dgilbert@redhat.com> <20200827153657.111098-6-dgilbert@redhat.com> From: Christophe de Dinechin In-reply-to: <20200827153657.111098-6-dgilbert@redhat.com> Date: Tue, 06 Oct 2020 18:17:51 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Virtio-fs] [PATCH v2 5/6] tools/virtiofsd: xattr name mappings: Map server xattr names List-Id: Development discussions about virtio-fs List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: virtio-fs@redhat.com, vgoyal@redhat.com, qemu-devel@nongnu.org On 2020-08-27 at 17:36 CEST, Dr. David Alan Gilbert (git) wrote... > 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 > --- > tools/virtiofsd/passthrough_ll.c | 88 ++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > index 9b9c8f3ab1..7cd99186f7 100644 > --- a/tools/virtiofsd/passthrough_ll.c > +++ b/tools/virtiofsd/passthrough_ll.c > @@ -2188,6 +2188,42 @@ static int xattr_map_client(const char *client_name, char **out_name) > abort(); > } > > +/* > + * For use with listxattr where the server fs gives us a name and we may need > + * 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 prefix > + * removed; no reallocation is done. > + * Returns 0 on success > + * Can return -ENODATA to indicate the name should be dropped from the list. > + */ > +static int xattr_map_server(const char *server_name, const char **out_name) > +{ > + const XattrMapEntry *cur_entry; > + for (cur_entry = xattr_map_list; ; cur_entry++) { > + if ((cur_entry->flags & XATTR_MAP_FLAG_SERVER) && > + (!strncmp(cur_entry->prepend, > + server_name, > + strlen(cur_entry->prepend)))) { Overall, the same remarks apply as for the client side. > + if (cur_entry->flags & XATTR_MAP_FLAG_END_BAD) { > + return -ENODATA; > + } > + if (cur_entry->flags & XATTR_MAP_FLAG_END_OK) { > + *out_name = server_name; > + return 0; > + } > + if (cur_entry->flags & XATTR_MAP_FLAG_PREFIX) { > + /* Remove prefix */ > + *out_name = server_name + strlen(cur_entry->prepend); > + 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_name, > size_t size) > { > @@ -2342,8 +2378,60 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) > if (ret == 0) { > goto out; > } > + > + if (lo->xattrmap) { > + /* > + * 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 = 0; > + in_index = 0; > + while (in_index < ret) { > + const char *map_out; > + char *in_ptr = value + in_index; > + /* Length of current attribute name */ > + size_t in_len = strlen(value + in_index) + 1; > + > + int mapret = xattr_map_server(in_ptr, &map_out); > + if (mapret != -ENODATA && mapret != 0) { > + /* Shouldn't happen */ > + saverr = -mapret; > + goto out; > + } > + if (mapret == 0) { > + /* Either unchanged, or truncated */ > + size_t out_len; > + if (map_out != in_ptr) { > + /* +1 copies the NIL */ > + out_len = strlen(map_out) + 1; > + } else { > + /* No change */ > + out_len = in_len; > + } > + /* > + * Move result along, may still be needed for an unchanged > + * entry if a previous entry was changed. > + */ > + memmove(value + out_index, map_out, out_len); > + > + out_index += out_len; > + } > + in_index += in_len; > + } > + ret = out_index; > + if (ret == 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: -- Cheers, Christophe de Dinechin (IRC c3d)