{"id":806880,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806880/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1503965694-10794-63-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:37","name":"[62/79] blkverify: Catch bs->exact_filename overflow","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c5d5d5928cc330d3a373ba24849410c06f0bc51d","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-63-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806880/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","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 3xh9VX0hfBz9sP5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 11:08:04 +1000 (AEST)","from localhost ([::1]:42180 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmV0b-000552-TE\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 21:08:01 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48775)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCo-0001fm-4Q\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCk-00064C-NF\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:34 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35113\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUCk-000632-G4\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:30 -0400","from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E8qK017779\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:30 -0400","from e14.ny.us.ibm.com (e14.ny.us.ibm.com [129.33.205.204])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2ww7t-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:29 -0400","from localhost\n\tby e14.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 20:16:29 -0400","from b01cxnp23034.gho.pok.ibm.com (9.57.198.29)\n\tby e14.ny.us.ibm.com (146.89.104.201) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 20:16:26 -0400","from b01ledav003.gho.pok.ibm.com (b01ledav003.gho.pok.ibm.com\n\t[9.57.199.108])\n\tby b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP\n\tid v7T0GPqd22675642; Tue, 29 Aug 2017 00:16:25 GMT","from b01ledav003.gho.pok.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 7AD9FB2058;\n\tMon, 28 Aug 2017 20:13:49 -0400 (EDT)","from localhost (unknown [9.80.85.217])\n\tby b01ledav003.gho.pok.ibm.com (Postfix) with ESMTP id 4D5DAB2046;\n\tMon, 28 Aug 2017 20:13:49 -0400 (EDT)"],"From":"Michael Roth <mdroth@linux.vnet.ibm.com>","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:37 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0052-0000-0000-00000257337D","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:27","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0053-0000-0000-000051D1D9B3","Message-Id":"<1503965694-10794-63-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=1\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH 62/79] blkverify: Catch bs->exact_filename\n\toverflow","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"qemu-stable@nongnu.org, Max Reitz <mreitz@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: Max Reitz <mreitz@redhat.com>\n\nThe bs->exact_filename field may not be sufficient to store the full\nblkverify node filename. In this case, we should not generate a filename\nat all instead of an unusable one.\n\nCc: qemu-stable@nongnu.org\nReported-by: Qu Wenruo <quwenruo@cn.fujitsu.com>\nSigned-off-by: Max Reitz <mreitz@redhat.com>\nMessage-id: 20170613172006.19685-3-mreitz@redhat.com\nReviewed-by: Alberto Garcia <berto@igalia.com>\nReviewed-by: Stefan Hajnoczi <stefanha@redhat.com>\nSigned-off-by: Max Reitz <mreitz@redhat.com>\n(cherry picked from commit 05cc758a3dfc79488d0a8eb7f5830a41871e78d0)\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n block/blkverify.c | 12 ++++++++----\n 1 file changed, 8 insertions(+), 4 deletions(-)","diff":"diff --git a/block/blkverify.c b/block/blkverify.c\nindex 6b0a603..06369f9 100644\n--- a/block/blkverify.c\n+++ b/block/blkverify.c\n@@ -301,10 +301,14 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)\n     if (bs->file->bs->exact_filename[0]\n         && s->test_file->bs->exact_filename[0])\n     {\n-        snprintf(bs->exact_filename, sizeof(bs->exact_filename),\n-                 \"blkverify:%s:%s\",\n-                 bs->file->bs->exact_filename,\n-                 s->test_file->bs->exact_filename);\n+        int ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),\n+                           \"blkverify:%s:%s\",\n+                           bs->file->bs->exact_filename,\n+                           s->test_file->bs->exact_filename);\n+        if (ret >= sizeof(bs->exact_filename)) {\n+            /* An overflow makes the filename unusable, so do not report any */\n+            bs->exact_filename[0] = 0;\n+        }\n     }\n }\n \n","prefixes":["62/79"]}