From nobody Mon Feb 9 03:13:55 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1624374933140992.6858457085607; Tue, 22 Jun 2021 08:15:33 -0700 (PDT) Received: from localhost ([::1]:33066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvi7g-0004Ht-4n for importer@patchew.org; Tue, 22 Jun 2021 11:15:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvi1X-00026r-4w for qemu-devel@nongnu.org; Tue, 22 Jun 2021 11:09:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvi1S-0005sZ-Kq for qemu-devel@nongnu.org; Tue, 22 Jun 2021 11:09:10 -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-592-BZ77o6aFMZCII5TXhwlWyw-1; Tue, 22 Jun 2021 11:09:04 -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 49937804147; Tue, 22 Jun 2021 15:09:03 +0000 (UTC) Received: from horse.redhat.com (ovpn-115-114.rdu2.redhat.com [10.10.115.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id C703F60916; Tue, 22 Jun 2021 15:08:59 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id 687C5225FCE; Tue, 22 Jun 2021 11:08:59 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624374545; 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=DTyNx9KOxoFz+giaagtGKef/aQBREHMod4NEDZYo4m4=; b=UjJsuOMGwyYjQ7Un2cAeNrJRUAS8ncqzUBaIPqYkyWs8wTJzkrTiJxlBc61VaNUXGqwOXt ggcSuD/t6D8l2jUOMODGpVIFb7FFSmqA3tg+ftGEIx/fHJo2wKM2g5XLMpwm5614daN79J vhaUnuBG2/YzaYy2IhyGxBMkVxXpGnA= X-MC-Unique: BZ77o6aFMZCII5TXhwlWyw-1 From: Vivek Goyal To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH v7 2/7] virtiofsd: Fix xattr operations overwriting errno Date: Tue, 22 Jun 2021 11:08:47 -0400 Message-Id: <20210622150852.1507204-3-vgoyal@redhat.com> In-Reply-To: <20210622150852.1507204-1-vgoyal@redhat.com> References: <20210622150852.1507204-1-vgoyal@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=vgoyal@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=170.10.133.124; envelope-from=vgoyal@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.223, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: miklos@szeredi.hu, dgilbert@redhat.com, vgoyal@redhat.com, lhenriques@suse.de Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" getxattr/setxattr/removexattr/listxattr operations handle regualar and non-regular files differently. For the case of non-regular files we do fchdir(/proc/self/fd) and the xattr operation and then revert back to original working directory. After this we are saving errno and that's buggy because fchdir() will overwrite the errno. FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D getxattr(procname, name, value, size); FCHDIR_NOFAIL(lo->root.fd); if (ret =3D=3D -1) saverr =3D errno In above example, if getxattr() failed, we will still return 0 to caller as errno must have been written by FCHDIR_NOFAIL(lo->root.fd) call. Fix all such instances and capture "errno" early and save in "saverr" variable. Signed-off-by: Vivek Goyal --- tools/virtiofsd/passthrough_ll.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 49c21fd855..ec91b3c133 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2791,15 +2791,17 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t = ino, const char *in_name, goto out_err; } ret =3D fgetxattr(fd, name, value, size); + saverr =3D ret =3D=3D -1 ? errno : 0; } else { /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D getxattr(procname, name, value, size); + saverr =3D ret =3D=3D -1 ? errno : 0; FCHDIR_NOFAIL(lo->root.fd); } =20 if (ret =3D=3D -1) { - goto out_err; + goto out; } if (size) { saverr =3D 0; @@ -2864,15 +2866,17 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t= ino, size_t size) goto out_err; } ret =3D flistxattr(fd, value, size); + saverr =3D ret =3D=3D -1 ? errno : 0; } else { /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D listxattr(procname, value, size); + saverr =3D ret =3D=3D -1 ? errno : 0; FCHDIR_NOFAIL(lo->root.fd); } =20 if (ret =3D=3D -1) { - goto out_err; + goto out; } if (size) { saverr =3D 0; @@ -2998,15 +3002,15 @@ static void lo_setxattr(fuse_req_t req, fuse_ino_t = ino, const char *in_name, goto out; } ret =3D fsetxattr(fd, name, value, size, flags); + saverr =3D ret =3D=3D -1 ? errno : 0; } else { /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D setxattr(procname, name, value, size, flags); + saverr =3D ret =3D=3D -1 ? errno : 0; FCHDIR_NOFAIL(lo->root.fd); } =20 - saverr =3D ret =3D=3D -1 ? errno : 0; - out: if (fd >=3D 0) { close(fd); @@ -3064,15 +3068,15 @@ static void lo_removexattr(fuse_req_t req, fuse_ino= _t ino, const char *in_name) goto out; } ret =3D fremovexattr(fd, name); + saverr =3D ret =3D=3D -1 ? errno : 0; } else { /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D removexattr(procname, name); + saverr =3D ret =3D=3D -1 ? errno : 0; FCHDIR_NOFAIL(lo->root.fd); } =20 - saverr =3D ret =3D=3D -1 ? errno : 0; - out: if (fd >=3D 0) { close(fd); --=20 2.25.4