From nobody Mon Apr 29 00:06:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1617962904; cv=none; d=zohomail.com; s=zohoarc; b=ER7mBM5oOi3u/To0Kl/rVNAZU1BzjqkqOYiQGNdMxTaUyL5ssGnwJSPc0TBbyJHYCLE73iFrkCdv9s7cV5dG6s9R+s17Z5eQizL4AevEVh21tC44Y/SpleHWrozxp7LwzoyEOcRBEh0xm8g8mKfzm7Q8K1aHNDMVz1jk0C9jZBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617962904; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Ufa/U48g+nenIcRO8P74ANqNK12p1pltH98H9W0aZHw=; b=Pb+oCyA/JKnglt3wdvNMMKVn8uReZk3pteB13ItLzz1wSxPvNCJ5MyTohh2+K+BuUhoBYoL3zfm8y7byC4ALxJFEQGa2nlhA0KNnCytlGBGJ7TdJAS2ZuvKReGhMq1hcfeA1n/Nm5Xis+Nc9RRnrK5GhcZHXOwWLfwOU5kTR2NA= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617962904903151.3351218332424; Fri, 9 Apr 2021 03:08:24 -0700 (PDT) Received: from localhost ([::1]:37704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUo3p-0004wL-Mm for importer@patchew.org; Fri, 09 Apr 2021 06:08:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUo2H-0004K7-8m for qemu-devel@nongnu.org; Fri, 09 Apr 2021 06:06:45 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:60840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUo2F-0003pf-Ew for qemu-devel@nongnu.org; Fri, 09 Apr 2021 06:06:45 -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-29--VfArW0eNkCQDIEwQfDM9g-1; Fri, 09 Apr 2021 06:06:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C97B6D4E0; Fri, 9 Apr 2021 10:06:36 +0000 (UTC) Received: from bahia.redhat.com (ovpn-112-136.ams2.redhat.com [10.36.112.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA80960BE5; Fri, 9 Apr 2021 10:06:28 +0000 (UTC) X-MC-Unique: -VfArW0eNkCQDIEwQfDM9g-1 From: Greg Kurz To: qemu-devel@nongnu.org Subject: [PATCH] virtiofsd: Fix side-effect in assert() Date: Fri, 9 Apr 2021 12:06:27 +0200 Message-Id: <20210409100627.451573-1-groug@kaod.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org 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: softfail client-ip=207.211.30.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no 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, misono.tomohiro@jp.fujitsu.com, "Dr. David Alan Gilbert" , Stefan Hajnoczi , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It is bad practice to put an expression with a side-effect in assert() because the side-effect won't happen if the code is compiled with -DNDEBUG. Use an intermediate variable. Consolidate this in an macro to have proper line numbers when the assertion is hit. virtiofsd: ../../tools/virtiofsd/passthrough_ll.c:2797: lo_getxattr: Assertion `fchdir_res =3D=3D 0' failed. Aborted 2796 /* fchdir should not fail here */ =3D>2797 FCHDIR_NOFAIL(lo->proc_self_fd); 2798 ret =3D getxattr(procname, name, value, size); 2799 FCHDIR_NOFAIL(lo->root.fd); Fixes: bdfd66788349 ("virtiofsd: Fix xattr operations") Cc: misono.tomohiro@jp.fujitsu.com Signed-off-by: Greg Kurz Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vivek Goyal Reviewed-by: Wainer dos Santos Moschetta --- tools/virtiofsd/passthrough_ll.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 1553d2ef454f..6592f96f685e 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -2723,6 +2723,11 @@ static int xattr_map_server(const struct lo_data *lo= , const char *server_name, return -ENODATA; } =20 +#define FCHDIR_NOFAIL(fd) do { \ + int fchdir_res =3D fchdir(fd); \ + assert(fchdir_res =3D=3D 0); \ + } while (0) + static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_nam= e, size_t size) { @@ -2789,9 +2794,9 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t in= o, const char *in_name, ret =3D fgetxattr(fd, name, value, size); } else { /* fchdir should not fail here */ - assert(fchdir(lo->proc_self_fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D getxattr(procname, name, value, size); - assert(fchdir(lo->root.fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->root.fd); } =20 if (ret =3D=3D -1) { @@ -2864,9 +2869,9 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t i= no, size_t size) ret =3D flistxattr(fd, value, size); } else { /* fchdir should not fail here */ - assert(fchdir(lo->proc_self_fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D listxattr(procname, value, size); - assert(fchdir(lo->root.fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->root.fd); } =20 if (ret =3D=3D -1) { @@ -3000,9 +3005,9 @@ static void lo_setxattr(fuse_req_t req, fuse_ino_t in= o, const char *in_name, ret =3D fsetxattr(fd, name, value, size, flags); } else { /* fchdir should not fail here */ - assert(fchdir(lo->proc_self_fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D setxattr(procname, name, value, size, flags); - assert(fchdir(lo->root.fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->root.fd); } =20 saverr =3D ret =3D=3D -1 ? errno : 0; @@ -3066,9 +3071,9 @@ static void lo_removexattr(fuse_req_t req, fuse_ino_t= ino, const char *in_name) ret =3D fremovexattr(fd, name); } else { /* fchdir should not fail here */ - assert(fchdir(lo->proc_self_fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D removexattr(procname, name); - assert(fchdir(lo->root.fd) =3D=3D 0); + FCHDIR_NOFAIL(lo->root.fd); } =20 saverr =3D ret =3D=3D -1 ? errno : 0; --=20 2.26.3