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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 5B975C4338F for ; Sat, 14 Aug 2021 15:44:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D5DC60EB2 for ; Sat, 14 Aug 2021 15:44:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238712AbhHNPoy (ORCPT ); Sat, 14 Aug 2021 11:44:54 -0400 Received: from mail.ispras.ru ([83.149.199.84]:44586 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234654AbhHNPoy (ORCPT ); Sat, 14 Aug 2021 11:44:54 -0400 Received: from hellwig.intra.ispras.ru (unknown [10.10.2.182]) by mail.ispras.ru (Postfix) with ESMTPSA id 4366440A2BD1; Sat, 14 Aug 2021 15:44:22 +0000 (UTC) Subject: Re: [PATCH] media: pt3: Fix IO unmapping on error handling paths in probe To: Andy Shevchenko Cc: Akihiro Tsukada , Mauro Carvalho Chehab , Kirill Shilimanov , "linux-media@vger.kernel.org" , "linux-kernel@vger.kernel.org" References: <20210812092435.8255-1-novikov@ispras.ru> From: Evgeny Novikov Message-ID: <45928f64-49ee-3a54-f2f4-79b059dd289a@ispras.ru> Date: Sat, 14 Aug 2021 18:44:12 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi Andy, On 12.08.2021 15:08, Andy Shevchenko wrote: > > > On Thursday, August 12, 2021, Evgeny Novikov > wrote: > > pt3_probe() did not free one of IO mappings in case when one of > them was > successful while another one failed. The patch fixed that. > > > > It makes code not better, what really may do is a conversion to > pcim_*() and devm_*() APIs. Thank you for the good suggestion. I will resend the patch. But you should take into account, that I have not an ability to test upcoming changes except for compiling them and checking some requirement specifications included into our verification framework. So, further work and decisions are up to driver developers. Best regards, Evgeny Novikov > > > Found by Linux Driver Verification project (linuxtesting.org > ). > > Signed-off-by: Evgeny Novikov > > Co-developed-by: Kirill Shilimanov > > Signed-off-by: Kirill Shilimanov > > --- >  drivers/media/pci/pt3/pt3.c | 20 +++++++++++++------- >  1 file changed, 13 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/pci/pt3/pt3.c b/drivers/media/pci/pt3/pt3.c > index c0bc86793355..f1bd2644435b 100644 > --- a/drivers/media/pci/pt3/pt3.c > +++ b/drivers/media/pci/pt3/pt3.c > @@ -736,19 +736,24 @@ static int pt3_probe(struct pci_dev *pdev, > const struct pci_device_id *ent) >         pt3->pdev = pdev; >         mutex_init(&pt3->lock); >         pt3->regs[0] = pci_ioremap_bar(pdev, 0); > -       pt3->regs[1] = pci_ioremap_bar(pdev, 2); > -       if (pt3->regs[0] == NULL || pt3->regs[1] == NULL) { > +       if (pt3->regs[0] == NULL) { >                 dev_err(&pdev->dev, "Failed to ioremap\n"); >                 ret = -ENOMEM; >                 goto err_kfree; >         } > +       pt3->regs[1] = pci_ioremap_bar(pdev, 2); > +       if (pt3->regs[1] == NULL) { > +               dev_err(&pdev->dev, "Failed to ioremap\n"); > +               ret = -ENOMEM; > +               goto err_iounmap0; > +       } > >         ver = ioread32(pt3->regs[0] + REG_VERSION); >         if ((ver >> 16) != 0x0301) { >                 dev_warn(&pdev->dev, "PT%d, I/F-ver.:%d not > supported\n", >                          ver >> 24, (ver & 0x00ff0000) >> 16); >                 ret = -ENODEV; > -               goto err_iounmap; > +               goto err_iounmap1; >         } > >         pt3->num_bufs = clamp_val(num_bufs, MIN_DATA_BUFS, > MAX_DATA_BUFS); > @@ -756,7 +761,7 @@ static int pt3_probe(struct pci_dev *pdev, > const struct pci_device_id *ent) >         pt3->i2c_buf = kmalloc(sizeof(*pt3->i2c_buf), GFP_KERNEL); >         if (pt3->i2c_buf == NULL) { >                 ret = -ENOMEM; > -               goto err_iounmap; > +               goto err_iounmap1; >         } >         i2c = &pt3->i2c_adap; >         i2c->owner = THIS_MODULE; > @@ -801,11 +806,12 @@ static int pt3_probe(struct pci_dev *pdev, > const struct pci_device_id *ent) >         i2c_del_adapter(i2c); >  err_i2cbuf: >         kfree(pt3->i2c_buf); > -err_iounmap: > -       if (pt3->regs[0]) > -               pci_iounmap(pdev, pt3->regs[0]); > +err_iounmap1: >         if (pt3->regs[1]) >                 pci_iounmap(pdev, pt3->regs[1]); > +err_iounmap0: > +       if (pt3->regs[0]) > +               pci_iounmap(pdev, pt3->regs[0]); >  err_kfree: >         kfree(pt3); >  err_release_regions: > -- > 2.26.2 > > > > -- > With Best Regards, > Andy Shevchenko > >