Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp3378687imm; Tue, 17 Jul 2018 03:59:28 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfzG5d5SQHmJ4MIos4z2U3e2+j5cF8Mt9ceojwT3EM4ZSXu8PGukOHq3M+uHA/8qotiS74j X-Received: by 2002:a63:b504:: with SMTP id y4-v6mr1127169pge.247.1531825168786; Tue, 17 Jul 2018 03:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531825168; cv=none; d=google.com; s=arc-20160816; b=rukSoAvcD2h2CzIrFF80JyqZyOw4+PDmFg6S233u6RUnwOt8gg33RQtpGI1zmoRJjM x2VGGmrcVGkS5PjKWCM1mL4NGw+WjC8k2YE5asKx2Z23hXgVKdE2e/zSpOSrv2DM35FT s8kPFJMDYTY6/DeyGsoFiFwisEPr25/LjSRFoilSx7LdVBLnq+r8bIWyMRGHbHzDJmiw 2ApKn7/nT3Nm0HLtWZuRvQbyNm9wi5sMhpbTJAP7w3paVr+FTLPNY1bQlmFxbAGglqVU QB1zxfCwRGULthuZ1Ba2uC6boPOqF45b4zWLIYus6Q7WB58+jn1jUpGZ+fQJ6rIkbMpG MFeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:arc-authentication-results; bh=50gZVPw0DokD5WQ33ogZG8bvwc2VvKZ5IqLvzutDgcQ=; b=zHzZkIef+Xsl35lPQngALohZXZetXcSoeW7BHyItHKJ1zRXKx5aEPZKRXyg+ZkTGTs QT60/n5InsddrdZAag8Z8hvKHc6ojNfTNroIvrKVLizYfN139EGEqBAjz18pG6RLffwi /7zDKfKiEZG3DPDVvK6HJ/iSukBHdK3IB9JbVvIueiY7ETg4y9bfbXGBOAlGxhPwdtYG UtSsLnEHUVi5CwcHbVhprwsUtHrE/4E6FAxL1vVEOlsGXL0+NOU+1r80f7RErU13NDdM UuHysziveKQppW/ZzXvft9aPiQQ60IVkTA8xZE/l0GQWj7It6Q8ZO5fOSyfiP79HRleI KwSQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w16-v6si581856plq.262.2018.07.17.03.59.13; Tue, 17 Jul 2018 03:59:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731292AbeGQL31 (ORCPT + 99 others); Tue, 17 Jul 2018 07:29:27 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:2253 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729641AbeGQL31 (ORCPT ); Tue, 17 Jul 2018 07:29:27 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1, AES128-SHA) id ; Tue, 17 Jul 2018 03:57:16 -0700 Received: from HQMAIL101.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Tue, 17 Jul 2018 03:57:23 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Tue, 17 Jul 2018 03:57:23 -0700 Received: from [10.21.26.144] (10.21.26.144) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Tue, 17 Jul 2018 10:57:18 +0000 Subject: Re: [PATCH] Revert "ata: ahci_platform: convert kcalloc to devm_kcalloc" To: Corentin Labbe , , , CC: , References: <1531824575-852-1-git-send-email-clabbe@baylibre.com> From: Mikko Perttunen Message-ID: Date: Tue, 17 Jul 2018 13:57:15 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <1531824575-852-1-git-send-email-clabbe@baylibre.com> X-Originating-IP: [10.21.26.144] X-ClientProxiedBy: UKMAIL101.nvidia.com (10.26.138.13) To HQMAIL101.nvidia.com (172.20.187.10) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks! Reviewed-by: Mikko Perttunen On 17.07.2018 13:49, Corentin Labbe wrote: > Since ahci_platform_put_resources() use target_pwrs after "devm_" freed > it, we cannot use devm_kcalloc for allocating target_pwrs. > > This reverts commit bd0038b1b4f499d814d8f33a55b1df5ea6cf3b85. > > Reported-by: Mikko Perttunen > Signed-off-by: Corentin Labbe > --- > drivers/ata/libahci_platform.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c > index fe8939e161ea..2ceebaf2ed56 100644 > --- a/drivers/ata/libahci_platform.c > +++ b/drivers/ata/libahci_platform.c > @@ -271,6 +271,8 @@ static void ahci_platform_put_resources(struct device *dev, void *res) > for (c = 0; c < hpriv->nports; c++) > if (hpriv->target_pwrs && hpriv->target_pwrs[c]) > regulator_put(hpriv->target_pwrs[c]); > + > + kfree(hpriv->target_pwrs); > } > > static int ahci_platform_get_phy(struct ahci_host_priv *hpriv, u32 port, > @@ -406,7 +408,11 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev) > rc = -ENOMEM; > goto err_out; > } > - hpriv->target_pwrs = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->target_pwrs), GFP_KERNEL); > + /* > + * We cannot use devm_ here, since ahci_platform_put_resources() uses > + * target_pwrs after devm_ have freed memory > + */ > + hpriv->target_pwrs = kcalloc(hpriv->nports, sizeof(*hpriv->target_pwrs), GFP_KERNEL); > if (!hpriv->target_pwrs) { > rc = -ENOMEM; > goto err_out; >