{"id":806873,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806873/?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-62-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:36","name":"[61/79] blkdebug: Catch bs->exact_filename overflow","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"327b86a50366255c761efce3da2ea7a31d7905c5","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-62-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/806873/checks/","tags":{},"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=)","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 3xh9P80Rzzz9sRV\n\tfor ;\n\tTue, 29 Aug 2017 11:03:24 +1000 (AEST)","from localhost ([::1]:42151 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmUw6-0000xh-01\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 21:03:22 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48732)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCn-0001eM-0l\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCj-000615-RU\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:32 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35092\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 )\n\tid 1dmUCj-0005zs-MG\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:29 -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\tv7T0EBKF017922\n\tfor ; Mon, 28 Aug 2017 20:16:29 -0400","from e11.ny.us.ibm.com (e11.ny.us.ibm.com [129.33.205.201])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2ww7j-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:29 -0400","from localhost\n\tby e11.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 20:16:28 -0400","from b01cxnp22034.gho.pok.ibm.com (9.57.198.24)\n\tby e11.ny.us.ibm.com (146.89.104.198) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 20:16:25 -0400","from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com\n\t[9.57.199.107])\n\tby b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP\n\tid v7T0GOTV21102718; Tue, 29 Aug 2017 00:16:24 GMT","from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 04674124037;\n\tMon, 28 Aug 2017 20:13:45 -0400 (EDT)","from localhost (unknown [9.80.85.217])\n\tby b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id C0720124035;\n\tMon, 28 Aug 2017 20:13:44 -0400 (EDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:36 -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-2213-0000-0000-00000210D382","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-2214-0000-0000-0000575DED35","Message-Id":"<1503965694-10794-62-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 61/79] blkdebug: Catch bs->exact_filename\n\toverflow","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":"qemu-stable@nongnu.org, Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Max Reitz \n\nThe bs->exact_filename field may not be sufficient to store the full\nblkdebug 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 \nSigned-off-by: Max Reitz \nMessage-id: 20170613172006.19685-2-mreitz@redhat.com\nReviewed-by: Alberto Garcia \nReviewed-by: Stefan Hajnoczi \nSigned-off-by: Max Reitz \n(cherry picked from commit de81d72d3d13a19edf4d461be3b0f5a877be0234)\nSigned-off-by: Michael Roth \n---\n block/blkdebug.c | 10 +++++++---\n 1 file changed, 7 insertions(+), 3 deletions(-)","diff":"diff --git a/block/blkdebug.c b/block/blkdebug.c\nindex 5ccb9ce..63bc5d4 100644\n--- a/block/blkdebug.c\n+++ b/block/blkdebug.c\n@@ -840,9 +840,13 @@ static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)\n }\n \n if (!force_json && bs->file->bs->exact_filename[0]) {\n- snprintf(bs->exact_filename, sizeof(bs->exact_filename),\n- \"blkdebug:%s:%s\", s->config_file ?: \"\",\n- bs->file->bs->exact_filename);\n+ int ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),\n+ \"blkdebug:%s:%s\", s->config_file ?: \"\",\n+ bs->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 opts = qdict_new();\n","prefixes":["61/79"]}