From nobody Mon May 6 15:04:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1605280084; cv=none; d=zohomail.com; s=zohoarc; b=h7GV4LFFqwIubbClxU3jEHtaoZ+WqOcmFpAQB/Mq/S6a3QJQQ5iWD8IMCaKAsFcjzPkb6xU0V2B/YWLKIsucoC7SoQdXcd6Pt4MEiPE5v6DuhhIFRur4C0h/uyyH6++nNDLrFGtmRX2ZaqVfXM4jfyjMKzUL47K3dBbJRWPrHyM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605280084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=ibRWVjWtmDr9F0XYYhxH/GScRHMADlxC4zJ1XTnY1lU=; b=AKGEy23UwVgvMLt0226P+OfPdz4D7p1eTRwhKsARm8vVEUO9Z41q1xUeSQELCOvlWG1a+J1LinTs4YhUhwkAZ9M89ys8afS7rvxAK96qQ2VitVVnVnKtMYLIxEIrLePCR1dSA5AHPoqYP49dXwCXD7WvexqdCbiamQ+zhtGAtWY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605280084064989.9089696128694; Fri, 13 Nov 2020 07:08:04 -0800 (PST) Received: from localhost ([::1]:58156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdagE-0004MS-9w for importer@patchew.org; Fri, 13 Nov 2020 10:08:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdafL-0003nG-1C; Fri, 13 Nov 2020 10:07:07 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:2092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdafG-0007te-NC; Fri, 13 Nov 2020 10:07:06 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4CXhdH2xf0zhYB3; Fri, 13 Nov 2020 23:06:43 +0800 (CST) Received: from huawei.com (10.175.124.27) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Fri, 13 Nov 2020 23:06:40 +0800 From: Alex Chen To: Subject: [PATCH v2] json: Fix a memleak in parse_pair() Date: Fri, 13 Nov 2020 14:55:25 +0000 Message-ID: <20201113145525.85151-1-alex.chen@huawei.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.124.27] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.32; envelope-from=alex.chen@huawei.com; helo=szxga06-in.huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/13 10:06:52 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, qemu-trivial@nongnu.org, qemu-devel@nongnu.org, kuhn.chenqun@huawei.com, zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In qobject_type(), NULL is returned when the 'QObject' returned from parse_= value() is not of QString type, and this 'QObject' memory will leaked. So we need to first cache the 'QObject' returned from parse_value(), and fi= nally free 'QObject' memory at the end of the function. Also, we add a testcast about invalid dict key. The memleak stack is as follows: Direct leak of 32 byte(s) in 1 object(s) allocated from: #0 0xfffe4b3c34fb in __interceptor_malloc (/lib64/libasan.so.4+0xd34fb) #1 0xfffe4ae48aa3 in g_malloc (/lib64/libglib-2.0.so.0+0x58aa3) #2 0xaaab3557d9f7 in qnum_from_int /Images/source_org/qemu_master/qemu/= qobject/qnum.c:25 #3 0xaaab35584d23 in parse_literal /Images/source_org/qemu_master/qemu/= qobject/json-parser.c:511 #4 0xaaab35584d23 in parse_value /Images/source_org/qemu_master/qemu/qo= bject/json-parser.c:554 #5 0xaaab35583d77 in parse_pair /Images/source_org/qemu_master/qemu/qob= ject/json-parser.c:270 #6 0xaaab355845db in parse_object /Images/source_org/qemu_master/qemu/q= object/json-parser.c:327 #7 0xaaab355845db in parse_value /Images/source_org/qemu_master/qemu/qo= bject/json-parser.c:546 #8 0xaaab35585b1b in json_parser_parse /Images/source_org/qemu_master/q= emu/qobject/json-parser.c:580 #9 0xaaab35583703 in json_message_process_token /Images/source_org/qemu= _master/qemu/qobject/json-streamer.c:92 #10 0xaaab355ddccf in json_lexer_feed_char /Images/source_org/qemu_mast= er/qemu/qobject/json-lexer.c:313 #11 0xaaab355de0eb in json_lexer_feed /Images/source_org/qemu_master/qe= mu/qobject/json-lexer.c:350 #12 0xaaab354aff67 in tcp_chr_read /Images/source_org/qemu_master/qemu/= chardev/char-socket.c:525 #13 0xfffe4ae429db in g_main_context_dispatch (/lib64/libglib-2.0.so.0+= 0x529db) #14 0xfffe4ae42d8f (/lib64/libglib-2.0.so.0+0x52d8f) #15 0xfffe4ae430df in g_main_loop_run (/lib64/libglib-2.0.so.0+0x530df) #16 0xaaab34d70bff in iothread_run /Images/source_org/qemu_master/qemu/= iothread.c:82 #17 0xaaab3559d71b in qemu_thread_start /Images/source_org/qemu_master/= qemu/util/qemu-thread-posix.c:519 Fixes: 532fb5328473 ("qapi: Make more of qobject_to()") Reported-by: Euler Robot Signed-off-by: Alex Chen Signed-off-by: Chen Qun Signed-off-by: Markus Armbruster --- qobject/json-parser.c | 12 ++++++------ tests/check-qjson.c | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/qobject/json-parser.c b/qobject/json-parser.c index d083810d37..c0f521b56b 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -257,8 +257,9 @@ static JSONToken *parser_context_peek_token(JSONParserC= ontext *ctxt) */ static int parse_pair(JSONParserContext *ctxt, QDict *dict) { + QObject *key_obj =3D NULL; + QString *key; QObject *value; - QString *key =3D NULL; JSONToken *peek, *token; =20 peek =3D parser_context_peek_token(ctxt); @@ -267,7 +268,8 @@ static int parse_pair(JSONParserContext *ctxt, QDict *d= ict) goto out; } =20 - key =3D qobject_to(QString, parse_value(ctxt)); + key_obj =3D parse_value(ctxt); + key =3D qobject_to(QString, key_obj); if (!key) { parse_error(ctxt, peek, "key is not a string in object"); goto out; @@ -297,13 +299,11 @@ static int parse_pair(JSONParserContext *ctxt, QDict = *dict) =20 qdict_put_obj(dict, qstring_get_str(key), value); =20 - qobject_unref(key); - + qobject_unref(key_obj); return 0; =20 out: - qobject_unref(key); - + qobject_unref(key_obj); return -1; } =20 diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 07a773e653..9a02079099 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -1415,6 +1415,14 @@ static void invalid_dict_comma(void) g_assert(obj =3D=3D NULL); } =20 +static void invalid_dict_key(void) +{ + Error *err =3D NULL; + QObject *obj =3D qobject_from_json("{32:'abc'}", &err); + error_free_or_abort(&err); + g_assert(obj =3D=3D NULL); +} + static void unterminated_literal(void) { Error *err =3D NULL; @@ -1500,6 +1508,7 @@ int main(int argc, char **argv) g_test_add_func("/errors/unterminated/dict_comma", unterminated_dict_c= omma); g_test_add_func("/errors/invalid_array_comma", invalid_array_comma); g_test_add_func("/errors/invalid_dict_comma", invalid_dict_comma); + g_test_add_func("/errors/invalid_dict_key", invalid_dict_key); g_test_add_func("/errors/unterminated/literal", unterminated_literal); g_test_add_func("/errors/limits/nesting", limits_nesting); g_test_add_func("/errors/multiple_values", multiple_values); --=20 2.19.1