Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/812797/?format=api
{ "id": 812797, "url": "http://patchwork.ozlabs.org/api/patches/812797/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912112855.24269-4-berrange@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "<20170912112855.24269-4-berrange@redhat.com>", "list_archive_url": null, "date": "2017-09-12T11:28:51", "name": "[v3,3/7] block: fix data type casting for crypto payload offset", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ad1b3a140cb73bf383e34a630b74c27360b5733b", "submitter": { "id": 2694, "url": "http://patchwork.ozlabs.org/api/people/2694/?format=api", "name": "Daniel P. Berrangé", "email": "berrange@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912112855.24269-4-berrange@redhat.com/mbox/", "series": [ { "id": 2673, "url": "http://patchwork.ozlabs.org/api/series/2673/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2673", "date": "2017-09-12T11:28:48", "name": "Misc improvements to crypto block driver", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/2673/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/812797/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/812797/checks/", "tags": {}, "related": [], "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>)", "ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=berrange@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 3xs2dy27nBz9s7B\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 12 Sep 2017 21:30:14 +1000 (AEST)", "from localhost ([::1]:35006 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 1drjOO-0003IK-A8\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 07:30:12 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:53809)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <berrange@redhat.com>) id 1drjNQ-0002zO-J3\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:13 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <berrange@redhat.com>) id 1drjNP-0004RH-GG\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 07:29:12 -0400", "from mx1.redhat.com ([209.132.183.28]:44276)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <berrange@redhat.com>)\n\tid 1drjNN-0004Pe-4q; Tue, 12 Sep 2017 07:29:09 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 4661081DEF;\n\tTue, 12 Sep 2017 11:29:08 +0000 (UTC)", "from localhost.localdomain.com (unknown [10.42.22.189])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id F141D6C41C;\n\tTue, 12 Sep 2017 11:29:06 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 4661081DEF", "From": "\"Daniel P. Berrange\" <berrange@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 12:28:51 +0100", "Message-Id": "<20170912112855.24269-4-berrange@redhat.com>", "In-Reply-To": "<20170912112855.24269-1-berrange@redhat.com>", "References": "<20170912112855.24269-1-berrange@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tTue, 12 Sep 2017 11:29:08 +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 v3 3/7] block: fix data type casting for crypto\n\tpayload offset", "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": "Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org,\n\tStefan Hajnoczi <stefanha@gmail.com>, 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": "The crypto APIs report the offset of the data payload as an uint64_t\ntype, but the block driver is casting to size_t or ssize_t which will\npotentially truncate.\n\nMost of the block APIs use int64_t for offsets meanwhile, so even if\nusing uint64_t in the crypto block driver we are still at risk of\ntruncation.\n\nChange the block crypto driver to use uint64_t, but add asserts that\nthe value is less than INT64_MAX.\n\nSigned-off-by: Daniel P. Berrange <berrange@redhat.com>\n---\n block/crypto.c | 13 +++++++++----\n 1 file changed, 9 insertions(+), 4 deletions(-)", "diff": "diff --git a/block/crypto.c b/block/crypto.c\nindex cc8afe0e0d..d68cbac2ac 100644\n--- a/block/crypto.c\n+++ b/block/crypto.c\n@@ -364,8 +364,9 @@ static int block_crypto_truncate(BlockDriverState *bs, int64_t offset,\n PreallocMode prealloc, Error **errp)\n {\n BlockCrypto *crypto = bs->opaque;\n- size_t payload_offset =\n+ uint64_t payload_offset =\n qcrypto_block_get_payload_offset(crypto->block);\n+ assert(payload_offset < (INT64_MAX - offset));\n \n offset += payload_offset;\n \n@@ -391,8 +392,9 @@ block_crypto_co_readv(BlockDriverState *bs, int64_t sector_num,\n uint8_t *cipher_data = NULL;\n QEMUIOVector hd_qiov;\n int ret = 0;\n- size_t payload_offset =\n+ uint64_t payload_offset =\n qcrypto_block_get_payload_offset(crypto->block) / 512;\n+ assert(payload_offset < (INT64_MAX / 512));\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n \n@@ -458,8 +460,9 @@ block_crypto_co_writev(BlockDriverState *bs, int64_t sector_num,\n uint8_t *cipher_data = NULL;\n QEMUIOVector hd_qiov;\n int ret = 0;\n- size_t payload_offset =\n+ uint64_t payload_offset =\n qcrypto_block_get_payload_offset(crypto->block) / 512;\n+ assert(payload_offset < (INT64_MAX / 512));\n \n qemu_iovec_init(&hd_qiov, qiov->niov);\n \n@@ -520,7 +523,9 @@ static int64_t block_crypto_getlength(BlockDriverState *bs)\n BlockCrypto *crypto = bs->opaque;\n int64_t len = bdrv_getlength(bs->file->bs);\n \n- ssize_t offset = qcrypto_block_get_payload_offset(crypto->block);\n+ uint64_t offset = qcrypto_block_get_payload_offset(crypto->block);\n+ assert(offset < INT64_MAX);\n+ assert(offset < len);\n \n len -= offset;\n \n", "prefixes": [ "v3", "3/7" ] }