From patchwork Wed Sep 11 21:18:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1161289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A42LaF8v"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46TFBd3xnyz9s00 for ; Thu, 12 Sep 2019 07:18:49 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6E02FCDF; Wed, 11 Sep 2019 21:18:45 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id C9918B1F for ; Wed, 11 Sep 2019 21:18:43 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 79B7082B for ; Wed, 11 Sep 2019 21:18:43 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id h195so14506801pfe.5 for ; Wed, 11 Sep 2019 14:18:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cyGed1GpR1lGn2O+pXOYbh1z4SqR9rffE9jLOJ4Xn5A=; b=A42LaF8vdQ63biTNUf12ZSS3XWQa/Yxdq7dq0exLY3UzOXLhUE4DtkImtAMaARjPJn jTjlJg+wXK6iMqCtVyNs5WteWDc84svkFjBpZC87op/roqWOcp0WFw2JtSJv7rA/cTJx FgYmrQYCSmGQCyvfD7R1j8gLdayGsqF5o+lMRidTgF3WJsjoH7JTsIWZ9XmiXCS4EFOf 76/SkQPia2JlPZnuMZaFg/ftXzaOrZlROdVyvaI3uABNqtKJ/SWT0AbUgN47N49k9Y0f 0oWm/WyJU7H5Etog6of9Ao+acIzjU8y5Nl4T9hsGU5vEaMg6zA8QgZOLMKvzZFlLTlos sIaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cyGed1GpR1lGn2O+pXOYbh1z4SqR9rffE9jLOJ4Xn5A=; b=anuDmQjaMESa7VCivnREDLen4nnuMlLv2FGSlGzXDMWEGscWMfa91unHp5LR1BRvy6 tXk9udctnqnEKB65WkW892xqkGKeV/rdv6i7tU6Gl+L3I0zl1HnkR04448V8cRTu1Zvb opDWJl0aKv6vL1NgfgFGSu14shbN8MgVvo+xOOlkn3/W2AQaHekxlP427o24VC2tGsHE NNB/RfbBk2BNrSpuS22/vz55Z9xhfA8bZGrVyTaI2y845/BwqTcG5meqsiWEg04rzMkz 2Eqc9tn6cxger9Ua2tDYfyP3Z1L0K3DzAQM/4A0jbpEX9sxKQwS6hcOysQWloyGIml1X m02w== X-Gm-Message-State: APjAAAW8VkhN4dACituDMPaQuhMDZo7yQv+jdiuGbGaE23JyhX1AE4Ac v+ADzgyaZyj6uf4p3PQwzOt1FIJb X-Google-Smtp-Source: APXvYqwpuwNqrVvorqVRomXKca//A+b/HU0fdr+/rhhs0ZQQfhHQFvywSisGhCCBPjhxrAW+CoTr0Q== X-Received: by 2002:a17:90a:e98e:: with SMTP id v14mr7974306pjy.101.1568236722299; Wed, 11 Sep 2019 14:18:42 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id k1sm24612487pfi.132.2019.09.11.14.18.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Sep 2019 14:18:41 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Wed, 11 Sep 2019 14:18:27 -0700 Message-Id: <1568236716-18105-1-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 01/10] raft: Free leaked json data X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Valgrind reported: 1924: compacting online - cluster ==29312== 2,886 (240 direct, 2,646 indirect) bytes in 6 blocks are definitely lost in loss record 406 of 413 ==29312== at 0x4C2DB8F: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==29312== by 0x44A5F4: xmalloc (util.c:138) ==29312== by 0x4308EA: json_create (json.c:1451) ==29312== by 0x4308EA: json_object_create (json.c:254) ==29312== by 0x430ED0: json_parser_push_object (json.c:1273) ==29312== by 0x430ED0: json_parser_input (json.c:1371) ==29312== by 0x431CF1: json_lex_input (json.c:991) ==29312== by 0x43233B: json_parser_feed (json.c:1149) ==29312== by 0x41D87F: parse_body.isra.0 (log.c:411) ==29312== by 0x41E141: ovsdb_log_read (log.c:476) ==29312== by 0x42646D: raft_read_log (raft.c:866) ==29312== by 0x42646D: raft_open (raft.c:951) ==29312== by 0x4151AF: ovsdb_storage_open__ (storage.c:81) ==29312== by 0x408FFC: open_db (ovsdb-server.c:642) ==29312== by 0x40657F: main (ovsdb-server.c:358) This patch fixes it. Signed-off-by: Yifeng Sun Acked-by: William Tu --- ovsdb/raft.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ovsdb/raft.c b/ovsdb/raft.c index 9eabe2cfeecd..a45c7f8ba998 100644 --- a/ovsdb/raft.c +++ b/ovsdb/raft.c @@ -883,6 +883,7 @@ raft_read_log(struct raft *raft) error = raft_apply_record(raft, i, &r); raft_record_uninit(&r); } + json_destroy(json); if (error) { return ovsdb_wrap_error(error, "error reading record %llu from " "%s log", i, raft->name);