From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ausLi-0003HF-An for qemu-devel@nongnu.org; Mon, 25 Apr 2016 22:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ausLh-0003OX-9u for qemu-devel@nongnu.org; Mon, 25 Apr 2016 22:03:38 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:34551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ausLg-0003OR-G0 for qemu-devel@nongnu.org; Mon, 25 Apr 2016 22:03:37 -0400 Date: Tue, 26 Apr 2016 12:02:30 +1000 From: David Gibson Message-ID: <20160426020230.GH15176@voom.fritz.box> References: <1461598566-28454-1-git-send-email-zhoujie2011@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nFBW6CQlri5Qm8JQ" Content-Disposition: inline In-Reply-To: <1461598566-28454-1-git-send-email-zhoujie2011@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH] Added negative check for get_image_size() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhou Jie Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org --nFBW6CQlri5Qm8JQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 25, 2016 at 11:36:06AM -0400, Zhou Jie wrote: > This patch adds check for negative return value from get_image_size(), > where it is missing. It avoids unnecessary two function calls. >=20 > Signed-off-by: Zhou Jie Applied to ppc-for-2.7, thanks. > --- > hw/ppc/spapr.c | 4 ++++ > 1 file changed, 4 insertions(+) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index feaab08..ccea633 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1842,6 +1842,10 @@ static void ppc_spapr_init(MachineState *machine) > exit(1); > } > spapr->rtas_size =3D get_image_size(filename); > + if (spapr->rtas_size < 0) { > + error_report("Could not get size of LPAR rtas '%s'", filename); > + exit(1); > + } > spapr->rtas_blob =3D g_malloc(spapr->rtas_size); > if (load_image_size(filename, spapr->rtas_blob, spapr->rtas_size) < = 0) { > error_report("Could not load LPAR rtas '%s'", filename); --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --nFBW6CQlri5Qm8JQ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXHsw2AAoJEGw4ysog2bOS7xMP/jTnj1ApBTpEMAL4VSvuqTLM Fh6TLQm02PgxXmXVaL6PNc99uZ6xAbOApJV919zc73w8T6UlMY0XlXx8UF8TuIGs YR1l2xzBWjl/MqatME734//+yiCnns52KX+Qv5uQ8SY3Y3OxgwtSJmB9nWpWI//I HGI/6Posm2MzZb53l5HaVbOUMzb66c+x6Fk0QjCa9X1REhELe6REg4ng0c555BB6 TNxJAjRzqS30qCibmyfy3YfSFQRV9qMlI/fbhgRAvb3xig7/GVshgOtQ0waq1H7O m6+5EPSkJ6jDDPq74Vy8VvnDCW/rjNPjUqp3NVuOdt8uLKd5d235PApcOUiIfzkr kndXcUY84wdR3IP8IYU1DOXhzpWavU34Ur7hK/CzQhw4aD1qxNGIPlzaKqo1clwu CyFkBLFUZqHTJZpx0zEcRliNGPmctAIVrP8DbH51QiFy6UYG5vWEhDIsuQ3WMTVg LQQyoLUDlXDxirufKNmOEXUzIOQ/j3/sn3gdcYlk/MdPHzymZ1CKis/TIwly2YJc K9pUbJOi4crAL3qSLIF8C0K27hlum0+D7SmL6FX+ehIX2vzRMA9gW5yCNFZ9d5w/ 4Ht5v/8PubmUgFmtvST2ZWzmeeo/T8tovZ6R84BFXgb2BEotdmSWNRpWslwejwQQ XU+6Rvg1thFZJUugVWoP =v+4P -----END PGP SIGNATURE----- --nFBW6CQlri5Qm8JQ--