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 6185BECE58E for ; Thu, 17 Oct 2019 16:03:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2720B20872 for ; Thu, 17 Oct 2019 16:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571328229; bh=QU23z2+/glw4sIQrTMn70ikhXvQufWpV7z96gHv7jP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xt5deYxkcJYZ8hTVPZ8aB6wwJS4kVklPSd+KJDu1aKkihuQDJtizb9fH74WA7xU1x d9o8A8MiMPNuudZUeCD3MkTSO2mg7wvPf/kmQ7lw81tCV2sQdNrw9POYUV9/t/J5f+ 0dDOvXuY7hD+/uhdpfzeEk7rdGnRC20r/BbSeqpk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440423AbfJQQDs (ORCPT ); Thu, 17 Oct 2019 12:03:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:47206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440401AbfJQQDp (ORCPT ); Thu, 17 Oct 2019 12:03:45 -0400 Received: from quaco.ghostprotocols.net (unknown [179.97.35.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3DBC021A4C; Thu, 17 Oct 2019 16:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571328224; bh=QU23z2+/glw4sIQrTMn70ikhXvQufWpV7z96gHv7jP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wcCprG2h0xmo0rJae+msNwGXz3elTBRxssYpqvrlllphK7vo8nnuU0cuwc7g+nZck J414rhJVVoC7iQ14qJ9Ptu0j2kPVZ8utqKV9malWqK6o3HIk+tAgTjrXDJ8CfwPL1Y xnFqddSQA813zudfDQe9KYZxRkBe6zMYWgdooRjM= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Yunfeng Ye , Alexander Shishkin , Feilong Lin , Hu Shiyuan , Jiri Olsa , Mark Rutland , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 11/11] perf kmem: Fix memory leak in compact_gfp_flags() Date: Thu, 17 Oct 2019 13:03:01 -0300 Message-Id: <20191017160301.20888-12-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191017160301.20888-1-acme@kernel.org> References: <20191017160301.20888-1-acme@kernel.org> MIME-Version: 1.0 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 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 --- 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 1e61e353f579..9661671cc26e 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -691,6 +691,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.21.0