From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44701C433DF for ; Tue, 23 Jun 2020 17:43:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F790206D4 for ; Tue, 23 Jun 2020 17:43:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592934229; bh=Ek0ULgVy39jBD8SSkFxugE25V40WPVHosBEnKWbkujI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BQyKW+bU7b/O++iA3+ZOKRbFVLEnOT9N7ZWnHRqp8XFCN/eb5YueOEoTZDtsiivsr sHuzHQTt7JBwsUHGypzjzCduhih0/ukXRWxbChkQN02OClxePV5Bci7hc+GB74XKyH CcA3LivUwdV6xcqNXFx+ZLaJhTjGNvL2+S3rpkOo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733228AbgFWRnr (ORCPT ); Tue, 23 Jun 2020 13:43:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:60212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733217AbgFWRfg (ORCPT ); Tue, 23 Jun 2020 13:35:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6424820774; Tue, 23 Jun 2020 17:35:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592933736; bh=Ek0ULgVy39jBD8SSkFxugE25V40WPVHosBEnKWbkujI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jXw0YH5Ee9AMNN6wIVh4ccUNX1TbAC4FYaBwpsXy6/EGFv3ZJ5/dpkfQehyi+DHTp HBxvQT0Cn2fCZoElUgEVYD2IJdBNTiREB3A9Rk4q7WMK8YwtVQRvSJLESIBUSnmejh DUUbBX9wnxlzvMheDAGlld7y4NtOv5Ft+6JCcwuM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Aditya Pakki , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 10/28] test_objagg: Fix potential memory leak in error handling Date: Tue, 23 Jun 2020 13:35:05 -0400 Message-Id: <20200623173523.1355411-10-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200623173523.1355411-1-sashal@kernel.org> References: <20200623173523.1355411-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aditya Pakki [ Upstream commit a6379f0ad6375a707e915518ecd5c2270afcd395 ] In case of failure of check_expect_hints_stats(), the resources allocated by objagg_hints_get should be freed. The patch fixes this issue. Signed-off-by: Aditya Pakki Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- lib/test_objagg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/test_objagg.c b/lib/test_objagg.c index 72c1abfa154dc..da137939a4100 100644 --- a/lib/test_objagg.c +++ b/lib/test_objagg.c @@ -979,10 +979,10 @@ static int test_hints_case(const struct hints_case *hints_case) err_world2_obj_get: for (i--; i >= 0; i--) world_obj_put(&world2, objagg, hints_case->key_ids[i]); - objagg_hints_put(hints); - objagg_destroy(objagg2); i = hints_case->key_ids_count; + objagg_destroy(objagg2); err_check_expect_hints_stats: + objagg_hints_put(hints); err_hints_get: err_check_expect_stats: err_world_obj_get: -- 2.25.1