From nobody Sat Nov 15 17:47:11 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1595598479; cv=none; d=zohomail.com; s=zohoarc; b=iCcxLX7476u6yKSzkQcHjBK6qcMax6FN2Ng393M//DpuKMopeWXsGsojsCz3U4R5JJQzev3Y4A2kxQ8Ccy7hmInbKMYeIqHc6U2NQF9uBw/c1estkzMTLXEkEAkgko/YWTbMmyP9e1xSIE7N2ozGeylo9I/4QwgMCAz39OS8GCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595598479; h=Content-Type:Content-Transfer-Encoding:Cc: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=VvFsC7Lqmvx3of1PoGeArHby5M5skyMWuK3318nba+A=; b=eTdUegXkpYZbTutI8wt6RucybCdDCfPeAjTXs8eSMs044N59XKDRQdvsMA1VRTvCozsgJm5vEG5MJzWzLlIEvIPQ96b2ZhmTfxmkGTwSMDGL300pd5JFf3OUFs8km0nYqPodJ61IUB9ByYfMAYbmXniuoeK+2CZ4WNnjvvHS6pY= ARC-Authentication-Results: i=1; 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 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 1595598479733363.297336109197; Fri, 24 Jul 2020 06:47:59 -0700 (PDT) Received: from localhost ([::1]:57708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyy3K-0004z9-0j for importer@patchew.org; Fri, 24 Jul 2020 09:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyy2a-000436-AK for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:12 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34539 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 1jyy2Y-0004CY-O7 for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:47:12 -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-286-4oQbOpbIMnqEijZVec0nlA-1; Fri, 24 Jul 2020 09:47:07 -0400 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 A09F0107B7F0; Fri, 24 Jul 2020 13:47:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-143.ams2.redhat.com [10.36.112.143]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 38479712C1; Fri, 24 Jul 2020 13:47:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AFAD611385FA; Fri, 24 Jul 2020 15:47:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595598429; 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=VvFsC7Lqmvx3of1PoGeArHby5M5skyMWuK3318nba+A=; b=Q3412s6DwzuChrspLcmzEmj5Of1LAZ7M27E37ZX1uEnQh3sXQZjz9BM7wljYIjDaLT4wTz JRQa4DQmChMUF3CpW6xgezdr21WaDe9k1roYwkodhQASMOWuchVgSPcJ+Pv188fTUUjcNG s3suxI06p4rGqYs7R0YRrp9RxwCdpsE= X-MC-Unique: 4oQbOpbIMnqEijZVec0nlA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/4] qapi/error: Check format string argument in error_*prepend() Date: Fri, 24 Jul 2020 15:47:04 +0200 Message-Id: <20200724134704.2248335-5-armbru@redhat.com> In-Reply-To: <20200724134704.2248335-1-armbru@redhat.com> References: <20200724134704.2248335-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 06:44:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, 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=-1, 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: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 error_propagate_prepend() "behaves like error_prepend()", and error_prepend() uses "formatting @fmt, ... like printf()". error_prepend() checks its format string argument, but error_propagate_prepend() does not. Fix by addint the format attribute to error_propagate_prepend() and error_vprepend(). This would have caught the bug fixed in the previous commit. Missed in commit 4b5766488f "error: Fix use of error_prepend() with &error_fatal, &error_abort". Inspired-by: Stefan Weil Suggested-by: Eric Blake Reviewed-by: Stefan Weil Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200723171205.14949-1-philmd@redhat.com> Reviewed-by: Markus Armbruster [Commit message tweaked] Signed-off-by: Markus Armbruster --- include/qapi/error.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index 7932594dce..eaa05c4837 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -382,13 +382,15 @@ void error_propagate(Error **dst_errp, Error *local_e= rr); * Please use ERRP_GUARD() and error_prepend() instead when possible. */ void error_propagate_prepend(Error **dst_errp, Error *local_err, - const char *fmt, ...); + const char *fmt, ...) + GCC_FMT_ATTR(3, 4); =20 /* * Prepend some text to @errp's human-readable error message. * The text is made by formatting @fmt, @ap like vprintf(). */ -void error_vprepend(Error *const *errp, const char *fmt, va_list ap); +void error_vprepend(Error *const *errp, const char *fmt, va_list ap) + GCC_FMT_ATTR(2, 0); =20 /* * Prepend some text to @errp's human-readable error message. --=20 2.26.2