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=-22.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 A9F5AC433E6 for ; Tue, 2 Feb 2021 18:36:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7DD4164F92 for ; Tue, 2 Feb 2021 18:36:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238709AbhBBSga (ORCPT ); Tue, 2 Feb 2021 13:36:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57840 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238768AbhBBSew (ORCPT ); Tue, 2 Feb 2021 13:34:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612290805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fyl4UhLeDGYOAotIfdCQEOAc+/SmCI2MbVX25WRRUF4=; b=TQHGhO0v1867d6gNg67iv9D3rQIZbx74bAqOZhbXkkib8444CLXt1REyjv+nZUuBmc7kKM S5yxA4Q+8Cw1aSqvFs4iADNFmweeYbSxWX8Vmv78VHPfJDnllN1923r72mZf5/1hWP5/Jz WfXCIGmKWEpZp9BoROZdacTJMudEMrU= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-235-Xe52zUeiPdKx1KfR4Fh6Ow-1; Tue, 02 Feb 2021 13:33:21 -0500 X-MC-Unique: Xe52zUeiPdKx1KfR4Fh6Ow-1 Received: by mail-ed1-f71.google.com with SMTP id y6so10030079edc.17 for ; Tue, 02 Feb 2021 10:33:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=fyl4UhLeDGYOAotIfdCQEOAc+/SmCI2MbVX25WRRUF4=; b=VbTbLXA1rpn/AjpiF3GBC08rQk/W1SLD9qdeD2NMtOJi1i8XqudzciNSA/lmm1PVak qkV6TKeMjA2RhMGAHIpX1S2+3EkTvzf0M9zDdi3nT0ZgJO8ardfiqMcOMAJYvO51Pxg4 AFEMUIIgRXJnVbo7KqJoheDkZKp61pYGB0dGhA9rhnzIIKYwicnMql+BCh6ueBI9QUtv 1/tAUGzzHL1JgP626rzMYe5Vuk1cB/IWZcbhPLHOaVT1ysluXr+SwxXsTJHEqEekXA19 COyg7AVBZxruS6xLUCI9pA6SrMfHbqYXvFxqEfatYKL0TvhblQHXxI7q9tN+BRh3vRDS GYZg== X-Gm-Message-State: AOAM532X3mCJVAhSZBBPPakyQAzhhO1CT+OxdR3MqmFx5pwrFiLPKcNW IVk1aG4WtzLRFpqjPmoZCYXuoojxhVmJcNe+DFHjb8efRwV8Z9MKjGRoep8yHf0qUB89/QmZqQy 8YRS20b55mL2Hp2XXA4qB58CeGMJiYuGoLw== X-Received: by 2002:aa7:dd16:: with SMTP id i22mr246959edv.215.1612290800552; Tue, 02 Feb 2021 10:33:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFoJxObjMsf7HhEymSiv0tpTYhbIkkTjLf+SQ/b0Whvh9vGWxliQWJDMqcfSvIXGTip/DQ3w== X-Received: by 2002:aa7:dd16:: with SMTP id i22mr246951edv.215.1612290800412; Tue, 02 Feb 2021 10:33:20 -0800 (PST) Received: from x1.localdomain (2001-1c00-0c1e-bf00-37a3-353b-be90-1238.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:37a3:353b:be90:1238]) by smtp.gmail.com with ESMTPSA id k6sm9752409ejb.84.2021.02.02.10.33.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 02 Feb 2021 10:33:19 -0800 (PST) Subject: Re: [PATCH] platform/x86: amd-pmc: put device on error paths To: Pan Bian , Shyam Sundar S K , Mark Gross Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210121045005.73342-1-bianpan2016@163.com> From: Hans de Goede Message-ID: Date: Tue, 2 Feb 2021 19:33:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <20210121045005.73342-1-bianpan2016@163.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org Hi, On 1/21/21 5:50 AM, Pan Bian wrote: > Put the PCI device rdev on error paths to fix potential reference count > leaks. > > Signed-off-by: Pan Bian Thank you for your patch, I've applied this patch to my review-hans branch: https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while. Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window. Regards, Hans > --- > drivers/platform/x86/amd-pmc.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c > index 0102bf1c7916..df140019c4bd 100644 > --- a/drivers/platform/x86/amd-pmc.c > +++ b/drivers/platform/x86/amd-pmc.c > @@ -210,31 +210,39 @@ static int amd_pmc_probe(struct platform_device *pdev) > dev->dev = &pdev->dev; > > rdev = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0)); > - if (!rdev || !pci_match_id(pmc_pci_ids, rdev)) > + if (!rdev || !pci_match_id(pmc_pci_ids, rdev)) { > + pci_dev_put(rdev); > return -ENODEV; > + } > > dev->cpu_id = rdev->device; > err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_LO); > if (err) { > dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS); > + pci_dev_put(rdev); > return pcibios_err_to_errno(err); > } > > err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val); > - if (err) > + if (err) { > + pci_dev_put(rdev); > return pcibios_err_to_errno(err); > + } > > base_addr_lo = val & AMD_PMC_BASE_ADDR_HI_MASK; > > err = pci_write_config_dword(rdev, AMD_PMC_SMU_INDEX_ADDRESS, AMD_PMC_BASE_ADDR_HI); > if (err) { > dev_err(dev->dev, "error writing to 0x%x\n", AMD_PMC_SMU_INDEX_ADDRESS); > + pci_dev_put(rdev); > return pcibios_err_to_errno(err); > } > > err = pci_read_config_dword(rdev, AMD_PMC_SMU_INDEX_DATA, &val); > - if (err) > + if (err) { > + pci_dev_put(rdev); > return pcibios_err_to_errno(err); > + } > > base_addr_hi = val & AMD_PMC_BASE_ADDR_LO_MASK; > pci_dev_put(rdev); >