From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7qOd-0005VQ-A5 for qemu-devel@nongnu.org; Thu, 17 Jul 2014 14:27:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7qOZ-0004jQ-3U for qemu-devel@nongnu.org; Thu, 17 Jul 2014 14:27:11 -0400 Received: from mail-we0-x22d.google.com ([2a00:1450:400c:c03::22d]:51814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7qOY-0004hP-Su for qemu-devel@nongnu.org; Thu, 17 Jul 2014 14:27:07 -0400 Received: by mail-we0-f173.google.com with SMTP id q58so3594159wes.32 for ; Thu, 17 Jul 2014 11:27:05 -0700 (PDT) Date: Thu, 17 Jul 2014 19:27:03 +0100 From: Stefan Hajnoczi Message-ID: <20140717182703.GA25858@stefanha-thinkpad.redhat.com> References: <1405590113-17052-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yrj/dFKFPuw6o+aM" Content-Disposition: inline In-Reply-To: <1405590113-17052-1-git-send-email-kwolf@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-2.1] qcow2: Fix error path for unknown incompatible features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, stefanha@redhat.com, maria.k@catit.be --yrj/dFKFPuw6o+aM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 17, 2014 at 11:41:53AM +0200, Kevin Wolf wrote: > qcow2's report_unsupported_feature() had two bugs: A 32 bit truncation > would prevent feature table entries for bits 32-63 from being used, and > it could assign errp multiple times if there was more than one unknown > feature, resulting in an error_set() assertion failure. >=20 > Fix the truncation, make sure to set the error exactly once and add a > qemu-iotests case for it. >=20 > This fixes https://bugs.launchpad.net/qemu/+bug/1342704/ >=20 > Reported-by: Maria Kustova > Signed-off-by: Kevin Wolf > --- > block/qcow2.c | 21 +++++++++++++----- > tests/qemu-iotests/036 | 52 +++++++++++++++++++++++++++++++++++++++= +++++- > tests/qemu-iotests/036.out | 35 ++++++++++++++++++++++++++++++ > tests/qemu-iotests/qcow2.py | 15 ++++++++----- > 4 files changed, 112 insertions(+), 11 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan --yrj/dFKFPuw6o+aM Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJTyBV3AAoJEJykq7OBq3PItgMIAIstfx6xDyeZNMWdA8UiCbiX uTf1UwR0+NkVN1LRm0F9nJCy8PXV0J+OlNJ3dd/VyEtGkH2ACUyKsMYt/3neLZ62 HQ9cGp+f6Ais3I805S3MdZNB8W2OHU6ID5yAvctYpoSnjQEJEfmiOu+ghF2N0Mm9 fGEsoLhtdFe2Oua6MFTkCDmY7Hyh9BMGrK3LtgMzqLpJg+NVpbv7OJ6pWOGMl7dA Rx2FbLqT946QoKNiS8Aj2YHSyYM3+VhXYtHpDPHCncTBG6NCchSytiTMfWU09trE J3ymYLE7fMRWo7ZeE1SkGQpavAOyc1ZmEIHibewZDvqajRd5ypLOXPgiD2lUCIk= =dz6c -----END PGP SIGNATURE----- --yrj/dFKFPuw6o+aM--