From patchwork Sun Nov 15 11:19:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 11906347 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56F30138B for ; Sun, 15 Nov 2020 11:20:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D1160223BD for ; Sun, 15 Nov 2020 11:20:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=web.de header.i=@web.de header.b="NqLuj3Ck" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D1160223BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:39936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keG4w-0008VE-QE for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Nov 2020 06:20:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keG3w-0007JR-S2 for qemu-devel@nongnu.org; Sun, 15 Nov 2020 06:19:16 -0500 Received: from mout.web.de ([212.227.15.4]:43265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keG3v-0002I9-4a for qemu-devel@nongnu.org; Sun, 15 Nov 2020 06:19:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1605439144; bh=DWWz3RQJAiKf+bWo3KoTKX1phBYkYcwBFKWPtTGuopw=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=NqLuj3CkJabIqs4QBsGDMBCt3A4Z+5Yi+OaLau8vpusB0u9NO1uCPIZRZci00nqHb yTSRXAcSgoca5NNZWZT6Bf5+9AbwktY0s757JnFyhyKFeuu7LOOZiaeEyDGAaS+HDe F1pJzq6LnEF6ppSEO6smUBYh9RCZKXcqbTjdr170= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([87.123.206.172]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1Meler-1k61Er1fWf-00aePw; Sun, 15 Nov 2020 12:19:04 +0100 Date: Sun, 15 Nov 2020 12:19:02 +0100 From: Lukas Straub To: qemu-devel Subject: [PATCH 1/2] net/colo-compare.c: Fix memory leak for non-tcp packet Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:QpbuwVIbQ6Lw53/UnQUPsurCn+zp23kMKkhkk0jMlfOLP9L6VQt HQZv1LT5D6YVa2zG7Q5ia5g4aL+omkRf+RJAejBftkFcyyZ98IbQp19FXKwxyd0DaeaC9WS twsoLfEEeYh4TJrCUSPkCGyxTyL2KCYpZpuqReWf/odFnGZ6Tuo6ufIF5ojG0Va9pAFJKed CiUkj5Bhlsqo6tqcfN9Mg== X-UI-Out-Filterresults: notjunk:1;V03:K0:dm5oMXAPeO0=:/C6SqKXbdMUDR/d0aJvY01 mHpIiRamIqyJ5HCqY9IuI3CKNhBfwZiMwxKVFHtOI/MZv9/s7uHSLTOObRdJJTtCa99f2w2kd NMTEQvrCvnTcszk8iuO6gtWx/dN7TLJVrfdVVzheOJ3USPn/LiIlm43tb5tfxs5dx4uhMx4Np xVOwJYlVv+umJlxy52hlWI7aRwkqV8MMeABcBqfNOrDjobjqsy5tOXkTNQqNRf4ctBPnaMb6B LqGm1pThWTzO7vJnGXeRW6PQ3msr+tjclPoEZoq8cQxkjYFn0WytAwlogGszcE2izA1HpFEK+ Z9KG3RbulOW97buSEAugLJp7+AtCF+0dprBv2ZTp5co0iI3V6YI63Pjh1CtJcxXCGB+SlPtP2 E7ygsb41Q2pDdqB4hbj8dnzEMNORYDM8UT//xMo68IDDvym92W/J5QAGvD8MUvdYFNVMCXz8w lHJowBe4LmebqnZpoI7iIMPlglWrL99uZMkFa4hHwo45R8wr3YPoGEz/K9vUxHo+rUUgNBP/L 3rRkF0D1NwgOuGTEpdEtEcDHem76UTDvwJ/WfOAB6CD0Suyl2Cj1P0PZ6EMfn1DGwaE6ECUbX 2LvQN8AyHEBd3knZAh6jSJsIxIjCyiRnqpFyVgx/q76EjJEfZ0wM1LbrcyGU4ZQnOg0BfKIjJ FPY5F+GbCQC/rhwQcJpglD1kjagVti3vF60lVJ8JFkXDUyeIPIJGHB3QCM6TUQzULKFdUxiI8 0TcIdziPKe/OTJ/k6HxhtfBrByXW+XuhXxRE+DmsUgXhIrkaQ8jjS2PV+1tEldZW+mKgCQkil kmmVSQUfzKHxRPgf3PyPny7mU31eyq0un78mn6ddAHRgYSrT3SD6VAKxVJHPtzP/BXatBrj3/ 1P+R+AmmXwdyjYd2h6Ig== Received-SPF: pass client-ip=212.227.15.4; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/15 06:19:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=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: Zhang Chen , Jason Wang , Li Zhijian Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Additional to removing the packet from the secondary queue, we also need to free it. Signed-off-by: Lukas Straub Reviewed-by: Zhang Chen --- net/colo-compare.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/net/colo-compare.c b/net/colo-compare.c index 337025b44f..eed0fbb27b 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -690,6 +690,7 @@ static void colo_compare_packet(CompareState *s, Connection *conn, if (result) { colo_release_primary_pkt(s, pkt); + packet_destroy(result->data, NULL); g_queue_remove(&conn->secondary_list, result->data); } else { /*