From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60563) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrpyI-0005zA-6G for qemu-devel@nongnu.org; Thu, 29 Oct 2015 12:22:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrpyE-00079s-RC for qemu-devel@nongnu.org; Thu, 29 Oct 2015 12:22:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrpyE-00079f-Lp for qemu-devel@nongnu.org; Thu, 29 Oct 2015 12:22:34 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 0E086AAA for ; Thu, 29 Oct 2015 16:22:33 +0000 (UTC) References: <1446122683-2355-1-git-send-email-armbru@redhat.com> <1446122683-2355-2-git-send-email-armbru@redhat.com> From: Eric Blake Message-ID: <563247C8.8000906@redhat.com> Date: Thu, 29 Oct 2015 10:22:32 -0600 MIME-Version: 1.0 In-Reply-To: <1446122683-2355-2-git-send-email-armbru@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="9q2vpF4qdTXOmeopGVKaxEurNdlxqC0Qq" Subject: Re: [Qemu-devel] [PATCH 1/4] json-streamer: Apply nesting limit more sanely List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: lcapitulino@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --9q2vpF4qdTXOmeopGVKaxEurNdlxqC0Qq Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/29/2015 06:44 AM, Markus Armbruster wrote: > The nesting limit from commit 29c75dd "json-streamer: limit the > maximum recursion depth and maximum token count" applies separately to > braces and brackets. This makes no sense. Apply it to their sum, > because that's actually a measure of recursion depth. >=20 > Signed-off-by: Markus Armbruster > --- > qobject/json-streamer.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Reviewed-by: Eric Blake >=20 > diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c > index 1b2f9b1..dced2c7 100644 > --- a/qobject/json-streamer.c > +++ b/qobject/json-streamer.c > @@ -64,8 +64,7 @@ static void json_message_process_token(JSONLexer *lex= er, QString *token, JSONTok > parser->bracket_count =3D=3D 0)) { > goto out_emit; > } else if (parser->token_size > MAX_TOKEN_SIZE || > - parser->bracket_count > MAX_NESTING || > - parser->brace_count > MAX_NESTING) { > + parser->bracket_count + parser->brace_count > MAX_NESTI= NG) { > /* Security consideration, we limit total memory allocated per= object > * and the maximum recursion depth that a message can force. > */ >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --9q2vpF4qdTXOmeopGVKaxEurNdlxqC0Qq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJWMkfIAAoJEKeha0olJ0NqbnEH/j3bn64JfA+sN8tJXFhpTyNe dcDt4UU6sYpOH40jHGoJSrHKVunDDv8yqOLIjL3oW5eHpKRLCrYR7XrOPxOPWJuP jBvAsFKiT98uKR+7/sL6yuh28siEZUPwFje/ZZSg/N1aTOTUoGUvHS8wUU5D4avM kg2QhX5A6aygGTGrKkr3rcRmOrfTAQJJnbR0X3VWyIm3IM2Z8EDS+MhA6mUEe8rg fIq4gfbaUkXVq3SwOIRBbTXg1yV/0+7/zfEcmu73+ryxnQ0IDue01p2rvaM5isxw jwSpSjkuIXT7reKBOZfEsTrN6ST1Xkk5ijOetx9wGUoL2q41CYVxt29vt+B3eJ0= =DQdN -----END PGP SIGNATURE----- --9q2vpF4qdTXOmeopGVKaxEurNdlxqC0Qq--