From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42780) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKmLa-0006k6-13 for qemu-devel@nongnu.org; Wed, 06 Jul 2016 08:54:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKmLY-0003Pm-3i for qemu-devel@nongnu.org; Wed, 06 Jul 2016 08:54:32 -0400 Date: Wed, 6 Jul 2016 14:54:22 +0200 From: Kevin Wolf Message-ID: <20160706125422.GG5233@noname.str.redhat.com> References: <20160615153630.2116-1-mreitz@redhat.com> <20160615153630.2116-3-mreitz@redhat.com> <20160706084015.GF5233@noname.str.redhat.com> <1a0e01ee-fdcd-3428-c2de-7ea8e50dc5a6@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Md/poaVZ8hnGTzuv" Content-Disposition: inline In-Reply-To: <1a0e01ee-fdcd-3428-c2de-7ea8e50dc5a6@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/2] qcow2: Avoid making the L1 table too big List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: qemu-block@nongnu.org, qemu-devel@nongnu.org, qemu-stable@nongnu.org --Md/poaVZ8hnGTzuv Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Am 06.07.2016 um 14:47 hat Max Reitz geschrieben: > On 06.07.2016 10:40, Kevin Wolf wrote: > > Am 15.06.2016 um 17:36 hat Max Reitz geschrieben: > >> We refuse to open images whose L1 table we deem "too big". Consequentl= y, > >> we should not produce such images ourselves. > >> > >> Cc: qemu-stable@nongnu.org > >> Signed-off-by: Max Reitz > >> --- > >> block/qcow2-cluster.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c > >> index 893ddf6..335b9b0 100644 > >> --- a/block/qcow2-cluster.c > >> +++ b/block/qcow2-cluster.c > >> @@ -65,7 +65,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64= _t min_size, > >> } > >> } > >> =20 > >> - if (new_l1_size > INT_MAX / sizeof(uint64_t)) { > >> + if (new_l1_size > QCOW_MAX_L1_SIZE / sizeof(uint64_t)) { > >> return -EFBIG; > >> } > >=20 > > Maybe add a QEMU_BUILD_BUG_ON(QCOW_MAX_L1_SIZE > INT_MAX)? >=20 > Good idea, did that. I changed it directly in my block branch, or do you > think a v2 mail necessary? No, letting you apply it directly is what I intended. Kevin --Md/poaVZ8hnGTzuv Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJXfP9+AAoJEH8JsnLIjy/W+K4QALmePqY+4T4l0ry0pvNpvep3 rBNNybH34gRjeNh96i0gJq/4lKOBTaI7d6SsVq57SKo+Mv0Ftmq7dLEhYd8PhK26 ec6Jng5ZJpMoy2GAy0im66NP5/STUY40Is7FJ4XoldF/B/0uMT++Puww7oObzoHB sKiBpK1LlqC4pr1rbt5nLMF21H5LtlzMIPodJS3eqLplDbCgTInyWhL5kidNe61V tHBc+sTQUO8lE8d7fbHjMA7iEOtH4zVeTs01uIDgLjx5kNYVQVjby8U34OLq7s+T lV+GZtBX65I74JQzZctMtwqZLpLkrlDdau8V8bNYv95NTrtzXZ4/nYmJsB9EsgKg QdppdwUic3hb84aKDllSjQfRaEYB0nsD8SyZ3+yTL5lMHzDQcq9q4M13ypMvE+xk jgtWWkjBdJP5G86NWXPx0n5us//1Wzn+UDAe/nv/3P2C22fEHSFY+I49qwuKGR5i tdOvefDBQTeRUaC1MYyRi/QCAppgdn6zuZ5WEmGjaKwQmz8yix+l2+R4YpGRvcLs J9hogGZv3yO89T/NaNQHV51N+qJooqnML1A7ykJNeQMNKUftxaFMYdUGvfdBEU/0 QgwSluD8WNZE6Ll0FEbaT5SJ29dNCQAJymsU5uBGmgkSkVhEf+ePXsoxi3CN9hE9 TmRfxjE8ZOUoys5r0DWF =8BJx -----END PGP SIGNATURE----- --Md/poaVZ8hnGTzuv--