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 6BDEECA9EC5 for ; Wed, 30 Oct 2019 15:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A5CA222CE for ; Wed, 30 Oct 2019 15:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572450998; bh=9iLboRNviI4kP0eBoLnyYVoI/5dVWOoyG59fJ9GyWRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fEuNeFJ93EpZPs+yIScxgMhr4igSzzUHIpQQKZXI19fFHxkLbtexblABlOknQ2Obg 2nl8nGAoWfVgMhR5uH2/r/XXufztTK5GkFyLfcnbE5nL3RVa+jVZM+oMMSrYqI8OCS qkkiPAm0mUQne2bpedqRBXv7IBSKMX+Khw/Y74TI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728869AbfJ3P4g (ORCPT ); Wed, 30 Oct 2019 11:56:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:58186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728840AbfJ3P4e (ORCPT ); Wed, 30 Oct 2019 11:56:34 -0400 Received: from sasha-vm.mshome.net (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 459CF217D9; Wed, 30 Oct 2019 15:56:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572450993; bh=9iLboRNviI4kP0eBoLnyYVoI/5dVWOoyG59fJ9GyWRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h27yOKUoekULW3frJnuZk7P2PsBU8/dfmcveBUAZ20iyjrXatCxNXwGbFJoj7W1mr N9dtLEyQZvV2N8hPYXM/qJkW2obl51Ge9ZbRTCb/qPfG+5eAJ0PkTZWzDarD0N/EO3 0EmR2u5j2SXZhqr6QH250pWjc1e3EndZA9BMfYsE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yunfeng Ye , Alexander Shishkin , Feilong Lin , Hu Shiyuan , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 4.14 15/24] perf kmem: Fix memory leak in compact_gfp_flags() Date: Wed, 30 Oct 2019 11:55:46 -0400 Message-Id: <20191030155555.10494-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191030155555.10494-1-sashal@kernel.org> References: <20191030155555.10494-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: Yunfeng Ye [ Upstream commit 1abecfcaa7bba21c9985e0136fa49836164dd8fd ] The memory @orig_flags is allocated by strdup(), it is freed on the normal path, but leak to free on the error path. Fix this by adding free(orig_flags) on the error path. Fixes: 0e11115644b3 ("perf kmem: Print gfp flags in human readable string") Signed-off-by: Yunfeng Ye Cc: Alexander Shishkin Cc: Feilong Lin Cc: Hu Shiyuan Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/f9e9f458-96f3-4a97-a1d5-9feec2420e07@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-kmem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 9e693ce4b73b0..ce786f363476e 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -687,6 +687,7 @@ static char *compact_gfp_flags(char *gfp_flags) new = realloc(new_flags, len + strlen(cpt) + 2); if (new == NULL) { free(new_flags); + free(orig_flags); return NULL; } -- 2.20.1