From nobody Sun Nov 16 04:16:13 2025 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=1598542809; cv=none; d=zohomail.com; s=zohoarc; b=dIK7MEacP6TIg1UJZri/pd9Ud/8H/8IFcjZa7HshVoDHatS0BTX8gosoijmo+aEF0ZFBy/cmhxbeL6ZqlPak4z5E1e9Qn8xpyPsmZm15gHQz0kdRXIKCCc6qFglocxkwquJOvDqQsynT4IE0ObJfDpdpwKR9ngq12rjbBE3u/BQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598542809; 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=J2Hcdv6y9uwn8fe101Z3EGICS4g/oAiTlP3M5dwO1s4=; b=JKNgeqhCJzfPuPNuF+IlhrdEQHRdoDdeqkFVkb/2BhLUc4Zh35XP6bjOqjjj089s0Jlw0Q+UxXB2oIIeOXGqTY+ZLlPeI4DreSdJIWT4OTmB2XJKCvwTkzEKPSWqTVf1991wXWrkJN0j4OvhrCVdNN06kj8lw2k15mgYuMOYmyw= 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 1598542809884291.74820894116; Thu, 27 Aug 2020 08:40:09 -0700 (PDT) Received: from localhost ([::1]:51846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBK0W-0002Aw-KT for importer@patchew.org; Thu, 27 Aug 2020 11:40:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJxr-0006v3-55 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47744 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 1kBJxo-00083v-6Q for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:22 -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-90-5qXIAWH8O0e4X_jfdfVFjw-1; Thu, 27 Aug 2020 11:37:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40139802B4E for ; Thu, 27 Aug 2020 15:37:15 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-163.ams2.redhat.com [10.36.114.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CD505D9F3; Thu, 27 Aug 2020 15:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598542639; 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=J2Hcdv6y9uwn8fe101Z3EGICS4g/oAiTlP3M5dwO1s4=; b=Ej71+hPEfORs1JBEpbW79wFu4vnSxOXCB8Xya19bnCyorPRQYiViX1+QuaJ0mSVP5If95m s7ZGigUqd8ZAChntFJ5u3wSIU4K8XGTrYqFRZPInHqYcui5WmExn53F+FLgkBVzwlZ51Rp Cb3JCcc3m55uTznMjuQ87FuS835PhFQ= X-MC-Unique: 5qXIAWH8O0e4X_jfdfVFjw-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, virtio-fs@redhat.com Subject: [PATCH v2 1/6] virtiofsd: Silence gcc warning Date: Thu, 27 Aug 2020 16:36:52 +0100 Message-Id: <20200827153657.111098-2-dgilbert@redhat.com> In-Reply-To: <20200827153657.111098-1-dgilbert@redhat.com> References: <20200827153657.111098-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0.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=205.139.110.120; envelope-from=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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=-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" Gcc worries fd might be used unset, in reality it's always set if fi is set, and only used if fi is set so it's safe. Initialise it to -1 just to keep gcc happy for now. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: J=C3=A1n Tomko --- tools/virtiofsd/passthrough_ll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 63d1d00565..083d17a960 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -617,7 +617,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, struct lo_inode *inode; int ifd; int res; - int fd; + int fd =3D -1; =20 inode =3D lo_inode(req, ino); if (!inode) { --=20 2.26.2 From nobody Sun Nov 16 04:16:13 2025 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=1598542734; cv=none; d=zohomail.com; s=zohoarc; b=ZXOSb9zdBoPhYK9ySEtORsT3qlChgHqiVbshYRYTYK6MvLdjqAgYvHOK+AJpgOE6NwxpdVKMbjV7+p7rNi8+NRK9w7VH8CIOMJd2LuWh9Cleoap7FcNkQvVEzCc7zS+3cBrepEXgAlYCHwiJBStV3mJZ+4CN0K2eZ8fx6bjtHuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598542734; 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=8FT3/mXww+h5qzwMAmXQIeGH93CwpIpl33mHHrI7cc0=; b=TsyJ+gw4oaKy7Az18LSvzSzr5VNiaeVYtNQmjAIFQlJ5gGgGttB4fi8SauxyefVuS4xD2rE6bHhTE/YOmx7YQEUAQ9Ep2iN9ycX2suxUlvihFkMX9LPKj0PpnpD/EkylrlmW1DldA2nWCtqD7mNj+yA8cnzELbnUPgoGDlsEJhQ= 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 159854273438330.33219699745439; Thu, 27 Aug 2020 08:38:54 -0700 (PDT) Received: from localhost ([::1]:46026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJzJ-0008Dq-6Q for importer@patchew.org; Thu, 27 Aug 2020 11:38:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJxp-0006st-QW for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBJxo-00083u-4b for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:21 -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-431-dzxUeLnLM9OG5P19D_ioHw-1; Thu, 27 Aug 2020 11:37:17 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AAB210ABDBF for ; Thu, 27 Aug 2020 15:37:16 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-163.ams2.redhat.com [10.36.114.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B5D95D9E8; Thu, 27 Aug 2020 15:37:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598542639; 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=8FT3/mXww+h5qzwMAmXQIeGH93CwpIpl33mHHrI7cc0=; b=H4DNVhIr51YqqOgPk4R+hN0Yl2JZREz+cFFO95I1+gsToCEfkf/idbMUaUYBJR7Uszqvq4 kmK8g+7fwJc6Z0v2pKxydKMCyjkAhjHeLtz5gaox3xQRv5ApCt1guB65HB58LjUzx6WnQJ lxkjE+f3NIawtwi9nczh2kEaAYJdOs0= X-MC-Unique: dzxUeLnLM9OG5P19D_ioHw-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, virtio-fs@redhat.com Subject: [PATCH v2 2/6] virtiofsd: Add printf checking to fuse_log Date: Thu, 27 Aug 2020 16:36:53 +0100 Message-Id: <20200827153657.111098-3-dgilbert@redhat.com> In-Reply-To: <20200827153657.111098-1-dgilbert@redhat.com> References: <20200827153657.111098-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0.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/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , 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" Use qemu's GCC_FMT_ATTR to add printf style checking to fuse_log. Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/fuse_log.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virtiofsd/fuse_log.h b/tools/virtiofsd/fuse_log.h index bf6c11ff11..3ea38312b0 100644 --- a/tools/virtiofsd/fuse_log.h +++ b/tools/virtiofsd/fuse_log.h @@ -15,6 +15,7 @@ */ =20 #include +#include "qemu/compiler.h" =20 /** * Log severity level @@ -69,6 +70,7 @@ void fuse_set_log_func(fuse_log_func_t func); * @param level severity level (FUSE_LOG_ERR, FUSE_LOG_DEBUG, etc) * @param fmt sprintf-style format string including newline */ +GCC_FMT_ATTR(2, 3) void fuse_log(enum fuse_log_level level, const char *fmt, ...); =20 #endif /* FUSE_LOG_H_ */ --=20 2.26.2 From nobody Sun Nov 16 04:16:13 2025 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=1598542877; cv=none; d=zohomail.com; s=zohoarc; b=R0PeYs74r5oHDjOO04r/c4I5YTSM4ppEbLHUZPt0nM6uY8nA12Xb//+TEla2V57Ayi+3I67yJGGLpopTBBhoGLNwZwpu9dRWqykhxF+CVqOJQm/KXuRkN4skeCGgNYUKPhh5bOuO/zlb4J+7VMvGcBJq93+h6t8SWwh+/jl+vuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598542877; 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=bSXp7nzHYoO7ZnW+cTkiuZUZNBEqxN/Ogh463B22eJA=; b=FWO+1ygkj9jiIKH4ePZu/9Rfkvtxsjdqp5VNX0QUbYeGU9Hwvdy/j5xkeYTVd0BlVGLygmUCR6uKEHCPsoksxybsvQ18onK16eI8cQCBgyBRXYCvrNI35+OZrmqM9p+iJR2M4kxGbPsACqkuhb2utdjPDH61XyDNJO3Vs3DvYG0= 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 1598542877981977.2149001895671; Thu, 27 Aug 2020 08:41:17 -0700 (PDT) Received: from localhost ([::1]:57312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBK1c-0004Rm-JG for importer@patchew.org; Thu, 27 Aug 2020 11:41:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJxr-0006xH-T8 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBJxp-000843-AT for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:23 -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-261-tU-yYX4WPsexLt4GDpZE5Q-1; Thu, 27 Aug 2020 11:37:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D54091DE07 for ; Thu, 27 Aug 2020 15:37:17 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-163.ams2.redhat.com [10.36.114.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id D81EC5D9E8; Thu, 27 Aug 2020 15:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598542640; 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=bSXp7nzHYoO7ZnW+cTkiuZUZNBEqxN/Ogh463B22eJA=; b=QRcboZUJwnLMPUZoUoPnhCDbLqM70DLhWRQdOaAIQNv7t8rvy5xsDb4hQTR6iUjUyEtFvg CZAILvl8vYPPGKIp8Z9zzoaBKIrbSiSeuiZFk0zRZCklwt3VqLM7W6ePgiANW67EKVr4It 53Qor4HKqnM/S8mcM+EBL57td/GVhyM= X-MC-Unique: tU-yYX4WPsexLt4GDpZE5Q-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, virtio-fs@redhat.com Subject: [PATCH v2 3/6] tools/virtiofsd: xattr name mappings: Add option Date: Thu, 27 Aug 2020 16:36:54 +0100 Message-Id: <20200827153657.111098-4-dgilbert@redhat.com> In-Reply-To: <20200827153657.111098-1-dgilbert@redhat.com> References: <20200827153657.111098-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0.001 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/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , 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" Add an option to define mappings of xattr names so that the client and server filesystems see different views. This can be used to have different SELinux mappings as seen by the guest, to run the virtiofsd with less privileges (e.g. in a case where it can't set trusted/system/security xattrs but you want the guest to be able to), or to isolate multiple users of the same name; e.g. trusted attributes used by stacking overlayfs. A mapping engine is used wit 3 simple rules; the rules can be combined to allow most useful mapping scenarios. The ruleset is defined by -o xattrmap=3D'rules...'. This patch doesn't use the rule maps yet. Signed-off-by: Dr. David Alan Gilbert --- docs/tools/virtiofsd.rst | 55 ++++++++++++ tools/virtiofsd/passthrough_ll.c | 148 +++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+) diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 824e713491..2efa16d3c5 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -107,6 +107,60 @@ Options performance. ``auto`` acts similar to NFS with a 1 second metadata cache timeout. ``always`` sets a long cache lifetime at the expense of cohere= ncy. =20 +xattr-mapping +------------- + +By default the name of xattr's used by the client are passed through to th= e server +file system. This can be a problem where either those xattr names are used +by something on the server (e.g. selinux client/server confusion) or if the +virtiofsd is running in a container with restricted priviliges where it ca= nnot +access some attributes. + +A mapping of xattr names can be made using -o xattrmap=3Dmapping where the= ``mapping`` +string consists of a series of rules. + +The first matching rule terminates the mapping. + +Each rule consists of a number of fields separated with a separator that i= s the +first non-white space character in the rule. This separator must then be = used +for the whole rule. +White space may be added before and after each rule. +Using ':' as the separator a rule is of the form: + +``:scope:type:key:prepend:`` + +**scope** is: + +- 'client' - match 'key' against a xattr name from the client for + setxattr/getxattr/removexattr +- 'server' - match 'prepend' against a xattr name from the server + for listxattr +- 'all' - can be used to match both cases. + +**type** is one of: + +- 'prefix' - If 'key' matches the client then the 'prepend' + is added before the name is passed to the server. + For a server case, the prepend is tested and stripped + if matching. + +- 'ok' - The attribute name is OK and passed through to + the server unchanged. + +- 'bad' - If a client tries to use this name it's + denied using EPERM; when the server passes an attribute + name matching it's hidden. + +**key** is a string tested as a prefix on an attribute name originating +on the client. It maybe empty in which case a 'client' rule +will always match on client names. + +**prepend** is a string tested as a prefix on an attribute name originiati= ng +on the server, and used as a new prefix. It maybe empty +in which case a 'server' rule will always match on all names from +the server. + + Examples -------- =20 @@ -123,3 +177,4 @@ Export ``/var/lib/fs/vm001/`` on vhost-user UNIX domain= socket -numa node,memdev=3Dmem \ ... guest# mount -t virtiofs myfs /mnt + diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 083d17a960..00e96a10cd 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -64,6 +64,7 @@ #include #include =20 +#include "qemu/cutils.h" #include "passthrough_helpers.h" #include "passthrough_seccomp.h" =20 @@ -144,6 +145,7 @@ struct lo_data { int flock; int posix_lock; int xattr; + char *xattrmap; char *source; char *modcaps; double timeout; @@ -171,6 +173,7 @@ static const struct fuse_opt lo_opts[] =3D { { "no_posix_lock", offsetof(struct lo_data, posix_lock), 0 }, { "xattr", offsetof(struct lo_data, xattr), 1 }, { "no_xattr", offsetof(struct lo_data, xattr), 0 }, + { "xattrmap=3D%s", offsetof(struct lo_data, xattrmap), 0 }, { "modcaps=3D%s", offsetof(struct lo_data, modcaps), 0 }, { "timeout=3D%lf", offsetof(struct lo_data, timeout), 0 }, { "timeout=3D", offsetof(struct lo_data, timeout_set), 1 }, @@ -2003,6 +2006,146 @@ static void lo_flock(fuse_req_t req, fuse_ino_t ino= , struct fuse_file_info *fi, fuse_reply_err(req, res =3D=3D -1 ? errno : 0); } =20 +typedef struct xattr_map_entry { + const char *key; + const char *prepend; + unsigned int flags; +} XattrMapEntry; + +/* + * Exit; process attribute unmodified if matched. + * An empty key applies to all. + */ +#define XATTR_MAP_FLAG_END_OK (1 << 0) +/* + * The attribute is unwanted; + * EPERM on write hidden on read. + */ +#define XATTR_MAP_FLAG_END_BAD (1 << 1) +/* + * For attr that start with 'key' prepend 'prepend' + * 'key' maybe empty to prepend for all attrs + * key is defined from set/remove point of view. + * Automatically reversed on read + */ +#define XATTR_MAP_FLAG_PREFIX (1 << 2) +/* Apply rule to get/set/remove */ +#define XATTR_MAP_FLAG_CLIENT (1 << 16) +/* Apply rule to list */ +#define XATTR_MAP_FLAG_SERVER (1 << 17) +/* Apply rule to all */ +#define XATTR_MAP_FLAG_ALL (XATTR_MAP_FLAG_SERVER | XATTR_MAP_FLAG_CLIEN= T) + +static XattrMapEntry *xattr_map_list; + +static XattrMapEntry *parse_xattrmap(const char *map) +{ + XattrMapEntry *res =3D NULL; + size_t nentries =3D 0; + const char *tmp; + + while (*map) { + char sep; + + if (isspace(*map)) { + map++; + continue; + } + /* The separator is the first non-space of the rule */ + sep =3D *map++; + if (!sep) { + break; + } + + /* Allocate some space for the rule */ + res =3D g_realloc_n(res, ++nentries, sizeof(XattrMapEntry)); + res[nentries - 1].flags =3D 0; + + if (strstart(map, "client", &map)) { + res[nentries - 1].flags |=3D XATTR_MAP_FLAG_CLIENT; + } else if (strstart(map, "server", &map)) { + res[nentries - 1].flags |=3D XATTR_MAP_FLAG_SERVER; + } else if (strstart(map, "all", &map)) { + res[nentries - 1].flags |=3D XATTR_MAP_FLAG_ALL; + } else { + fuse_log(FUSE_LOG_ERR, + "%s: Unexpected scope;" + " Expecting 'client', 'server', or 'all', in rule %zu= \n", + __func__, nentries); + exit(1); + } + + + if (*map !=3D sep) { + fuse_log(FUSE_LOG_ERR, + "%s: Expecting '%c' found '%c'" + " after scope in rule %zu\n", + __func__, sep, *map, nentries + 1); + exit(1); + } + /* Skip the separator, now at the start of the 'type' */ + map++; + + /* Start of 'type' */ + if (strstart(map, "prefix", &map)) { + res[nentries - 1].flags |=3D XATTR_MAP_FLAG_PREFIX; + } else if (strstart(map, "ok", &map)) { + res[nentries - 1].flags |=3D XATTR_MAP_FLAG_END_OK; + } else if (strstart(map, "bad", &map)) { + res[nentries - 1].flags |=3D XATTR_MAP_FLAG_END_BAD; + } else { + fuse_log(FUSE_LOG_ERR, + "%s: Unexpected type;" + "Expecting 'prefix', 'ok', or 'bad' in rule %zu\n", + __func__, nentries); + exit(1); + } + + if (*map++ !=3D sep) { + fuse_log(FUSE_LOG_ERR, + "%s: Missing '%c' at end of type field of rule %zu\n", + __func__, sep, nentries); + exit(1); + } + + /* At start of 'key' field */ + tmp =3D strchr(map, sep); + if (!tmp) { + fuse_log(FUSE_LOG_ERR, + "%s: Missing '%c' at end of key field of rule %zu", + __func__, sep, nentries); + exit(1); + } + res[nentries - 1].key =3D g_strndup(map, tmp - map); + map =3D tmp + 1; + + /* At start of 'prepend' field */ + tmp =3D strchr(map, sep); + if (!tmp) { + fuse_log(FUSE_LOG_ERR, + "%s: Missing '%c' at end of prepend field of rule %zu= ", + __func__, sep, nentries); + exit(1); + } + res[nentries - 1].prepend =3D g_strndup(map, tmp - map); + map =3D tmp + 1; + /* End of rule - go around again for another rule */ + } + + if (!nentries) { + fuse_log(FUSE_LOG_ERR, "Empty xattr map\n"); + exit(1); + } + + /* Add a terminator to error in cases the user hasn't specified */ + res =3D g_realloc_n(res, ++nentries, sizeof(XattrMapEntry)); + res[nentries - 1].flags =3D XATTR_MAP_FLAG_ALL | XATTR_MAP_FLAG_END_BA= D; + res[nentries - 1].key =3D g_strdup(""); + res[nentries - 1].prepend =3D g_strdup(""); + + return res; +} + static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *name, size_t size) { @@ -2909,6 +3052,11 @@ int main(int argc, char *argv[]) } else { lo.source =3D strdup("/"); } + + if (lo.xattrmap) { + xattr_map_list =3D parse_xattrmap(lo.xattrmap); + } + if (!lo.timeout_set) { switch (lo.cache) { case CACHE_NONE: --=20 2.26.2 From nobody Sun Nov 16 04:16:13 2025 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=1598542818; cv=none; d=zohomail.com; s=zohoarc; b=bL7WAkQp4ryO1VYY2Y5d2Dg0/K8FmMC7VgtE4Cw5QO2/ye/7n3zZCUZ6aTzdef3T6D4PuYp9HKYY6PT6c3xh89KfueF4QyWVApil84h2TZyEpVplIafEecoJmL4yiRCEWIFLu9tnm4xyQ3cakD33GcgaJoA/2/CRFO3aVcejTTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598542818; 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=r91M8MQeCokQJV/nOclZ42P4cIc/WBl7/dpvzziqhmI=; b=GT++jDk/MOBVjhQCyixUhtMY2m3pPQN6kndaVMPSyAld8W6WL+ZMCWer82eHaTSrkbnr6xu3T/Yr+ssYcQoK9HduY2MCdKg3Edils1l0RYHViVwYKKAJFPqSqml+rEUPH3AdWbos68L8o/CMOiADTChuUdjAFKK1y2u1qzkAts8= 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 1598542818401789.3113744109162; Thu, 27 Aug 2020 08:40:18 -0700 (PDT) Received: from localhost ([::1]:52556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBK0f-0002ST-6G for importer@patchew.org; Thu, 27 Aug 2020 11:40:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJxz-000747-1T for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:32 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:56191 helo=us-smtp-delivery-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 1kBJxx-000861-7J for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:30 -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-221-bY1zom5MOTCLGBKXlLztfA-1; Thu, 27 Aug 2020 11:37:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EE3C41DDFF for ; Thu, 27 Aug 2020 15:37:24 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-163.ams2.redhat.com [10.36.114.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2CC885D9E8; Thu, 27 Aug 2020 15:37:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598542647; 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=r91M8MQeCokQJV/nOclZ42P4cIc/WBl7/dpvzziqhmI=; b=Ii5Il3pfa8BQ6ZGg9cwoEHc9kh/JJ0LZ99nrHs8ioKPAEFnyvKKV9In4D8kxSnPNrbG8Dx sBQueq8ANpSyeFjcJSB543labcU764p0j89DmkHOHMPkDFYqVaQyHl0WtkFuJRw7eXSLB2 uFzlFyb7LE8hwBqug6MU5b0VlP+fhV8= X-MC-Unique: bY1zom5MOTCLGBKXlLztfA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, virtio-fs@redhat.com Subject: [PATCH v2 4/6] tools/virtiofsd: xattr name mappings: Map client xattr names Date: Thu, 27 Aug 2020 16:36:55 +0100 Message-Id: <20200827153657.111098-5-dgilbert@redhat.com> In-Reply-To: <20200827153657.111098-1-dgilbert@redhat.com> References: <20200827153657.111098-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.81; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:53:04 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H3=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 --- tools/virtiofsd/passthrough_ll.c | 102 ++++++++++++++++++++++++++++++- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 00e96a10cd..9b9c8f3ab1 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2146,20 +2146,81 @@ static XattrMapEntry *parse_xattrmap(const char *ma= p) 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 char *client_name, char **out_name) +{ + const XattrMapEntry *cur_entry; + + for (cur_entry =3D xattr_map_list; ; cur_entry++) { + if ((cur_entry->flags & XATTR_MAP_FLAG_CLIENT) && + (!strncmp(cur_entry->key, + client_name, + strlen(cur_entry->key)))) { + 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(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 @@ -2224,6 +2285,7 @@ out_err: saverr =3D errno; out: fuse_reply_err(req, saverr); + g_free(mapped_name); goto out_free; } =20 @@ -2301,19 +2363,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(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 @@ -2348,21 +2426,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(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 @@ -2397,6 +2492,7 @@ out: } =20 lo_inode_put(lo, &inode); + g_free(mapped_name); fuse_reply_err(req, saverr); } =20 --=20 2.26.2 From nobody Sun Nov 16 04:16:13 2025 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=1598542884; cv=none; d=zohomail.com; s=zohoarc; b=Zn7KFjbS/o/PRB6FQtnpTeXS9OtqH8HlQRTXtoxRRPXfupbFJkp2LBxvP8p1NaDF7xXLZliIc5HvYFkuVij7+cpvukzwT+davFWHhYw2RoiaiF31XH/+As+VpNXJCwBNryWgG5pEVNowIj5VAiaR1khlTkkOiKt6wtyXOcqE+kw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598542884; 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=qhGt35mHUuzt86T3Gdeo7KocdI0utkzrJK/Zh2sbGu4=; b=l5Nbw3xMebOgO/ewkMoPjJciOOsWomdsnWESNfID1yEFXwE0sxC6er6pKngwhUx5IPcEtUf28XPCPRPHw17wfGZh03457uiGe6OZ1z7P1B5jLoImOZhzTZtx7cqBp+AXF8ndRL+BXlecxQuQGV6n4gQ4Bilp4An1RwU+gisS3XU= 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 159854288450623.372102343505162; Thu, 27 Aug 2020 08:41:24 -0700 (PDT) Received: from localhost ([::1]:57774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBK1j-0004dD-3m for importer@patchew.org; Thu, 27 Aug 2020 11:41:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJy0-00074p-ON for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBJxx-00086F-I0 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37: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-530-8rz8DJ1GPO2Thk1qdzs5zA-1; Thu, 27 Aug 2020 11:37:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45F73185FD83 for ; Thu, 27 Aug 2020 15:37:26 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-163.ams2.redhat.com [10.36.114.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4521B5D9E8; Thu, 27 Aug 2020 15:37:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598542648; 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=qhGt35mHUuzt86T3Gdeo7KocdI0utkzrJK/Zh2sbGu4=; b=E2xGvbR0iQOlqPX4Gh9xG2L7WDhdaDH3tM1MRyhuCZ1iyIDEWihoD//lzdzPSFp+RvogqU F57vT1+elTtKDREo2d1u4qKDbuPUYLR+7GQ6UdWxmr9kXARoCibQcohKu731HTpj2SmNFX ir5wQ11CNdWHN1L5QFtDhRn4Qxi894E= X-MC-Unique: 8rz8DJ1GPO2Thk1qdzs5zA-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, virtio-fs@redhat.com Subject: [PATCH v2 5/6] tools/virtiofsd: xattr name mappings: Map server xattr names Date: Thu, 27 Aug 2020 16:36:56 +0100 Message-Id: <20200827153657.111098-6-dgilbert@redhat.com> In-Reply-To: <20200827153657.111098-1-dgilbert@redhat.com> References: <20200827153657.111098-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0.001 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=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/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , 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 --- 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(); } =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 char *server_name, const char **out_name) +{ + const XattrMapEntry *cur_entry; + for (cur_entry =3D xattr_map_list; ; cur_entry++) { + if ((cur_entry->flags & XATTR_MAP_FLAG_SERVER) && + (!strncmp(cur_entry->prepend, + server_name, + strlen(cur_entry->prepend)))) { + if (cur_entry->flags & XATTR_MAP_FLAG_END_BAD) { + return -ENODATA; + } + if (cur_entry->flags & XATTR_MAP_FLAG_END_OK) { + *out_name =3D server_name; + return 0; + } + if (cur_entry->flags & XATTR_MAP_FLAG_PREFIX) { + /* Remove prefix */ + *out_name =3D 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_nam= e, size_t size) { @@ -2342,8 +2378,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->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 =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(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.26.2 From nobody Sun Nov 16 04:16:13 2025 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=1598542817; cv=none; d=zohomail.com; s=zohoarc; b=fHWEoGQXmaPk2NdGsBnb04UgkjgEuZgHS4dK1I4U2/f3VlQLLVHnp9ZbCKcTIV274NDEE2ECpy9k+5iCybONKVZ8vDVFCSEaVquNMsEpciujSLYWiQPcfgXfu5sStTzbvgBMDTtoiTfNYkc2zNVSenNMD+Y9awElOQQJJ22hFJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598542817; 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=2QYq4Wy4BL95yd485TZY7hK9rTHHXrGNPSze6UgH9cw=; b=UTCgeGZTeNidzIW7wR1RL7ETbeGcp+iZpBzTM9Z+l7/AyHeH8lRjfUJwhXPKGiGMo/Wii41f6FZvAM86mIi+YJlRXAbmHxSW0YZPT1l8DvG0P05Gqwmg1nIz31VFqcHXU5Kp86t+254A4ojh8wOX36yJmwe7jgzTQ4iLUOXLPtI= 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 1598542817252326.0040503872227; Thu, 27 Aug 2020 08:40:17 -0700 (PDT) Received: from localhost ([::1]:52410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBK0d-0002Ot-So for importer@patchew.org; Thu, 27 Aug 2020 11:40:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJy2-00076F-3b for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:34 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52988 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 1kBJy0-00086R-DZ for qemu-devel@nongnu.org; Thu, 27 Aug 2020 11:37:33 -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-387-xffI8G3hNNGY2OLdFPJLQw-1; Thu, 27 Aug 2020 11:37:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 964A6185FD81 for ; Thu, 27 Aug 2020 15:37:27 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-114-163.ams2.redhat.com [10.36.114.163]) by smtp.corp.redhat.com (Postfix) with ESMTP id 913FF5D9E8; Thu, 27 Aug 2020 15:37:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598542650; 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=2QYq4Wy4BL95yd485TZY7hK9rTHHXrGNPSze6UgH9cw=; b=Itbx5pf5r9WrN/M2PT80eaWKnJMWrYOfvnZSAxY3Y3IdqGeTcbhqsCke5qK1AyeCDCkriJ WbK/6wZcfGJgfGALfuHUpvXGrMCRV3k645/AHHLAWF7mezi329RW8PFaHRsSAjPSAuo0D1 4VDPwVx7ADWtWvQnmqnNxm6cp+iifYk= X-MC-Unique: xffI8G3hNNGY2OLdFPJLQw-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, vgoyal@redhat.com, stefanha@redhat.com, virtio-fs@redhat.com Subject: [PATCH v2 6/6] tools/virtiofsd: xattr name mapping examples Date: Thu, 27 Aug 2020 16:36:57 +0100 Message-Id: <20200827153657.111098-7-dgilbert@redhat.com> In-Reply-To: <20200827153657.111098-1-dgilbert@redhat.com> References: <20200827153657.111098-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0.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=207.211.31.120; envelope-from=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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=-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" Add a few examples of xattrmaps to the documentation. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: J=C3=A1n Tomko --- docs/tools/virtiofsd.rst | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 2efa16d3c5..a138549862 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -161,6 +161,55 @@ in which case a 'server' rule will always match on all= names from the server. =20 =20 +xattr-mapping Examples +---------------------- + +1) Prefix all attributes with 'user.virtiofs.' + +:: + +-o xattrmap=3D":all:prefix::user.virtiofs.::all:bad:::" + + +This uses two rules, using : as the field separator; +the first rule prefixes and strips 'user.virtiofs.', +the second rule hides any non-prefixed attributes that +the host set. + +2) Prefix 'trusted.' attributes, allow others through + +:: + + "/all/prefix/trusted./user.virtiofs./ + /server/bad//trusted./ + /client/bad/user.virtiofs.trusted.// + /all/ok///" + + +Here there are four rules, using / as the field +separator, and also demonstrating that new lines can +be included between rules. +The first rule is the prefixing of 'trusted.'. +The second rule hides unprefixed 'trusted.' attributes +on the host. +The third rule stops a guest from explicitily setting +the 'user.viritofs.trusted.' path directly. +Finally, the fourth rule lets all remaining attributes +through. + +3) Hide 'security.' attributes, and allow everything else + +:: + + "/all/bad/security./security./ + /all/ok///' + +The first rule combines what could be separate client and server +rules into a single 'all' rule, matching 'security.' in either +client arguments or lists returned from the host. This stops +the client seeing any 'security.' attributes on the server and +stops it setting any. + Examples -------- =20 --=20 2.26.2