{"id":812511,"url":"http://patchwork.ozlabs.org/api/patches/812511/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-31-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170911172022.4738-31-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-11T17:20:14","name":"[v7,30/38] qtest: Avoid passing raw strings through hmp()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1e2ca5d177f97ab07f97ac06ffdebbe96f532f60","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170911172022.4738-31-eblake@redhat.com/mbox/","series":[{"id":2534,"url":"http://patchwork.ozlabs.org/api/series/2534/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2534","date":"2017-09-11T17:19:47","name":"Preliminary libqtest cleanups","version":7,"mbox":"http://patchwork.ozlabs.org/series/2534/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812511/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812511/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xrbDw3y4Zz9s7F\n\tfor ;\n\tTue, 12 Sep 2017 03:55:28 +1000 (AEST)","from localhost ([::1]:59514 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drSve-0005YO-ID\n\tfor incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 13:55:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38916)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drSP3-0007xi-7A\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:51 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drSP2-0001Uk-AP\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:45 -0400","from mx1.redhat.com ([209.132.183.28]:28635)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1drSP2-0001US-5G\n\tfor qemu-devel@nongnu.org; Mon, 11 Sep 2017 13:21:44 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 3BCF416483E\n\tfor ; Mon, 11 Sep 2017 17:21:43 +0000 (UTC)","from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 031995DC1E;\n\tMon, 11 Sep 2017 17:21:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3BCF416483E","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Mon, 11 Sep 2017 12:20:14 -0500","Message-Id":"<20170911172022.4738-31-eblake@redhat.com>","In-Reply-To":"<20170911172022.4738-1-eblake@redhat.com>","References":"<20170911172022.4738-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tMon, 11 Sep 2017 17:21:43 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v7 30/38] qtest: Avoid passing raw strings\n\tthrough hmp()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, thuth@redhat.com, armbru@redhat.com,\n\t\"Dr. David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"hmp() passes its string argument through the sprintf() family;\nwith a proper attribute, gcc -Wformat warns us when we do something\ndangerous like passing a non-constant format string. Fortunately,\nall our strings were safe, but checking whether the string can\ncontain an unintended % is easy to avoid and therefore worth doing.\n\nSigned-off-by: Eric Blake \n\n---\nv7: add GCC_FMT_ATTR here, drop R-b\n---\n tests/libqtest.h | 8 ++++----\n tests/test-hmp.c | 4 ++--\n 2 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/tests/libqtest.h b/tests/libqtest.h\nindex 2a21bf4605..5651b77d2f 100644\n--- a/tests/libqtest.h\n+++ b/tests/libqtest.h\n@@ -153,14 +153,14 @@ QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event);\n /**\n * qtest_hmp:\n * @s: #QTestState instance to operate on.\n- * @fmt...: HMP command to send to QEMU\n+ * @fmt...: HMP command to send to QEMU, formats arguments like sprintf().\n *\n * Send HMP command to QEMU via QMP's human-monitor-command.\n * QMP events are discarded.\n *\n * Returns: the command's output. The caller should g_free() it.\n */\n-char *qtest_hmp(QTestState *s, const char *fmt, ...);\n+char *qtest_hmp(QTestState *s, const char *fmt, ...) GCC_FMT_ATTR(2, 3);\n\n /**\n * qtest_hmpv:\n@@ -585,13 +585,13 @@ static inline QDict *qmp_eventwait_ref(const char *event)\n\n /**\n * hmp:\n- * @fmt...: HMP command to send to QEMU\n+ * @fmt...: HMP command to send to QEMU, formats arguments like sprintf().\n *\n * Send HMP command to QEMU via QMP's human-monitor-command.\n *\n * Returns: the command's output. The caller should g_free() it.\n */\n-char *hmp(const char *fmt, ...);\n+char *hmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2);\n\n /**\n * get_irq:\ndiff --git a/tests/test-hmp.c b/tests/test-hmp.c\nindex 7ff47eda13..b3102daea1 100644\n--- a/tests/test-hmp.c\n+++ b/tests/test-hmp.c\n@@ -80,7 +80,7 @@ static void test_commands(void)\n if (verbose) {\n fprintf(stderr, \"\\t%s\\n\", hmp_cmds[i]);\n }\n- response = hmp(hmp_cmds[i]);\n+ response = hmp(\"%s\", hmp_cmds[i]);\n g_free(response);\n }\n\n@@ -103,7 +103,7 @@ static void test_info_commands(void)\n if (verbose) {\n fprintf(stderr, \"\\t%s\\n\", info);\n }\n- resp = hmp(info);\n+ resp = hmp(\"%s\", info);\n g_free(resp);\n /* And move forward to the next line */\n info = strchr(endp + 1, '\\n');\n","prefixes":["v7","30/38"]}