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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 788C0C432BE for ; Thu, 5 Aug 2021 19:45:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CD1D60E52 for ; Thu, 5 Aug 2021 19:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239355AbhHETp4 (ORCPT ); Thu, 5 Aug 2021 15:45:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239020AbhHETpx (ORCPT ); Thu, 5 Aug 2021 15:45:53 -0400 Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54E87C061765; Thu, 5 Aug 2021 12:45:39 -0700 (PDT) Received: by mail-oi1-x233.google.com with SMTP id y18so8887126oiv.3; Thu, 05 Aug 2021 12:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=oqhS5sUxb+FPRaCHmEWlXq3OvfKWMu7XyfbVn+a5nZ0=; b=ofpTRUJcKmfmo43OyrJS4dZ5vMxWnnJ0cbyaTvQzR9uVGmEcyeB0XNSK/Xj+HZP1uQ iJZPQdwsWTRpdZ/yllLQhRQeUCaShZrke6Eu3N7VECTgzErEupVOCkWFIO/d5tN0FiWL JZ87mc5Y9d/gPNfVxe05qY84BGaAbtfO8tQ6SzaMzoGLKwN53MBFeuhTjX4KsE+OSv36 X1Z0nHMsUdFyHWZ0UkC6SVY0kLa1lFz85NXBSp57KBgJse2ReaW6jVuRzkrQJcvC0yJk Rm65oqHcuWn8yy8MtXEANt+7U3hdIwM7kWvXa7AS2P7aninDFW1MyHZSqSZw4lvIGlRD tMHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=oqhS5sUxb+FPRaCHmEWlXq3OvfKWMu7XyfbVn+a5nZ0=; b=H8KV1P0/qu6OcmimGIJb0EkQQGQCvJHSJYS1VWq0gz0SiaNHR3z1x3oLwM5DOrWpYv g+1V4rjB+DETFUbQvasIbKZ3eexNjGVw0yRbN7D+jFTf8M7kl9KqrRLNaDqvaBCmCw3p oDGK4CVrv4Q+dd/+ZkDKppOVRfdNNypHXK8tzCvDkKou9GP1mypR0hcOo40Aa0c2+3T4 W/YW5bNrH59jpoJjChd2QIREQCmnpMffkwXyWVWDYlkxJ7DDGLnKo3S/5fH9PcfwvWaP Sppa9M8o0rn5PLd2Yuc3opNn96MoymPjuzuFdnXUCGKwfKNQreIRa/+qRXMcFIMu5cLu yeSA== X-Gm-Message-State: AOAM530rcRM9seXBo5FGLke7Yj2h9LiaQ39uV+tdIJyZyi2dtKqxpeIi 8DpimO1vQ7xe78n0Il3ZLjJTDe2XeloRpFYCSIo= X-Google-Smtp-Source: ABdhPJxrEYt0szkcD/cfSYhFo1AC+UgnnsHdkrgRqo4gcN3MWQd6mMuRE94WTAiaWxNSQ9u9S4jqhgDoI1vNMkMuBcI= X-Received: by 2002:a05:6808:6d2:: with SMTP id m18mr4805541oih.120.1628192738822; Thu, 05 Aug 2021 12:45:38 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Alex Deucher Date: Thu, 5 Aug 2021 15:45:27 -0400 Message-ID: Subject: Re: [PATCH] drm/amd/pm: Fix a memory leak in an error handling path in 'vangogh_tables_init()' To: Christophe JAILLET Cc: "Deucher, Alexander" , Christian Koenig , xinhui pan , Dave Airlie , Daniel Vetter , Huang Rui , "Quan, Evan" , Xiaojian Du , Kevin Wang , "Su, Jinzhou (Joe)" , amd-gfx list , Maling list - DRI developers , LKML , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Applied. Thanks! Alex On Thu, Aug 5, 2021 at 2:44 PM Christophe JAILLET wrote: > > 'watermarks_table' must be freed instead 'clocks_table', because > 'clocks_table' is known to be NULL at this point and 'watermarks_table' is > never freed if the last kzalloc fails. > > Fixes: c98ee89736b8 ("drm/amd/pm: add the fine grain tuning function for vangogh") > Signed-off-by: Christophe JAILLET > --- > drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c > index 335b3c70e1a7..06eea917284e 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c > @@ -256,7 +256,7 @@ static int vangogh_tables_init(struct smu_context *smu) > return 0; > > err3_out: > - kfree(smu_table->clocks_table); > + kfree(smu_table->watermarks_table); > err2_out: > kfree(smu_table->gpu_metrics_table); > err1_out: > -- > 2.30.2 > 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 EED49C4338F for ; Thu, 5 Aug 2021 19:45:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 8C0C460E52 for ; Thu, 5 Aug 2021 19:45:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8C0C460E52 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 883DD6EB25; Thu, 5 Aug 2021 19:45:41 +0000 (UTC) Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id B1FCB6EB24; Thu, 5 Aug 2021 19:45:39 +0000 (UTC) Received: by mail-oi1-x22d.google.com with SMTP id n16so8901017oij.2; Thu, 05 Aug 2021 12:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=oqhS5sUxb+FPRaCHmEWlXq3OvfKWMu7XyfbVn+a5nZ0=; b=ofpTRUJcKmfmo43OyrJS4dZ5vMxWnnJ0cbyaTvQzR9uVGmEcyeB0XNSK/Xj+HZP1uQ iJZPQdwsWTRpdZ/yllLQhRQeUCaShZrke6Eu3N7VECTgzErEupVOCkWFIO/d5tN0FiWL JZ87mc5Y9d/gPNfVxe05qY84BGaAbtfO8tQ6SzaMzoGLKwN53MBFeuhTjX4KsE+OSv36 X1Z0nHMsUdFyHWZ0UkC6SVY0kLa1lFz85NXBSp57KBgJse2ReaW6jVuRzkrQJcvC0yJk Rm65oqHcuWn8yy8MtXEANt+7U3hdIwM7kWvXa7AS2P7aninDFW1MyHZSqSZw4lvIGlRD tMHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=oqhS5sUxb+FPRaCHmEWlXq3OvfKWMu7XyfbVn+a5nZ0=; b=RvP5X6NMXBoJBCpcECDkUr4K2JJ9EtcDhvpsFzw3K7agpbdia0WiqPBoOx7UDYmtr/ zUdKwd+amPmb2OeH4E6bpiJcnTk5FabAEbB7q1c7MyBf+Chd1OkUZZFe7ZBJAsQsMBfa IuN3C07w/eXq1Ous4Z0vXVSHqLjZk9VDf7U/KD7IqJX8al1yNz2Df1jKWjd9NRCkOpux scNwizxYkXOkZi8lY1+H0Cwagh7gFnspEOTgM4idwH17iOFO3NqnB7mun3ds/gTYzwZe 9KxnrDNPIdl+bFugypVNGtU2JkxQ7W5h8C7S2xvmhka6Y9ldojUbJlwCKqqdQFRG7WGU 3PrA== X-Gm-Message-State: AOAM533+ns1r4T2LvcpWgzBq21/WZ/mGRyHbOKDhr5mSmqhnBr2Ycne0 cU7lVVpwWxqbbRJowgXRgObcB2CzR2Py927hRok= X-Google-Smtp-Source: ABdhPJxrEYt0szkcD/cfSYhFo1AC+UgnnsHdkrgRqo4gcN3MWQd6mMuRE94WTAiaWxNSQ9u9S4jqhgDoI1vNMkMuBcI= X-Received: by 2002:a05:6808:6d2:: with SMTP id m18mr4805541oih.120.1628192738822; Thu, 05 Aug 2021 12:45:38 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Alex Deucher Date: Thu, 5 Aug 2021 15:45:27 -0400 Message-ID: Subject: Re: [PATCH] drm/amd/pm: Fix a memory leak in an error handling path in 'vangogh_tables_init()' To: Christophe JAILLET Cc: "Deucher, Alexander" , Christian Koenig , xinhui pan , Dave Airlie , Daniel Vetter , Huang Rui , "Quan, Evan" , Xiaojian Du , Kevin Wang , "Su, Jinzhou (Joe)" , amd-gfx list , Maling list - DRI developers , LKML , kernel-janitors@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Applied. Thanks! Alex On Thu, Aug 5, 2021 at 2:44 PM Christophe JAILLET wrote: > > 'watermarks_table' must be freed instead 'clocks_table', because > 'clocks_table' is known to be NULL at this point and 'watermarks_table' is > never freed if the last kzalloc fails. > > Fixes: c98ee89736b8 ("drm/amd/pm: add the fine grain tuning function for vangogh") > Signed-off-by: Christophe JAILLET > --- > drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c > index 335b3c70e1a7..06eea917284e 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c > @@ -256,7 +256,7 @@ static int vangogh_tables_init(struct smu_context *smu) > return 0; > > err3_out: > - kfree(smu_table->clocks_table); > + kfree(smu_table->watermarks_table); > err2_out: > kfree(smu_table->gpu_metrics_table); > err1_out: > -- > 2.30.2 >