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;
MIME-Version: 1.0
References: <20181001100052.3580-1-brgl@bgdev.pl> <44adbace-6849-e37f-70f0-d11661e6bdc9@lechnology.com>
In-Reply-To: <44adbace-6849-e37f-70f0-d11661e6bdc9@lechnology.com>
From:   Bartosz Golaszewski <brgl@bgdev.pl>
Date:   Mon, 1 Oct 2018 18:10:45 +0200
Message-ID: <CAMRc=Mec1AYX20ZVf0BJmMpovtONW5VifB70-dRXp+PJ-zGvYA@mail.gmail.com>
Subject: Re: [PATCH] nvmem: fix nvmem_cell_get_from_lookup()
To:     David Lechner <david@lechnology.com>
Cc:     Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
        "David S . Miller" <davem@davemloft.net>,
        Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Arnd Bergmann <arnd@arndb.de>,
        Jonathan Corbet <corbet@lwn.net>, Sekhar Nori <nsekhar@ti.com>,
        Kevin Hilman <khilman@kernel.org>,
        Boris Brezillon <boris.brezillon@bootlin.com>,
        Andrew Lunn <andrew@lunn.ch>, Alban Bedel <albeu@free.fr>,
        Maxime Ripard <maxime.ripard@bootlin.com>,
        Chen-Yu Tsai <wens@csie.org>,
        Dan Carpenter <dan.carpenter@oracle.com>,
        linux-doc <linux-doc@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

pon., 1 pa=C5=BA 2018 o 18:03 David Lechner <david@lechnology.com> napisa=
=C5=82(a):
>
> On 10/01/2018 05:00 AM, Bartosz Golaszewski wrote:
> > From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> >
> > We check if the pointer returned by __nvmem_device_get() is not NULL
> > while we should actually check if it is not IS_ERR(nvmem). Fix it.
> >
> > While we're at it: fix the next error path where we should assign an
> > error value to cell before returning.
> >
> > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
> > ---
> >   drivers/nvmem/core.c | 5 +++--
> >   1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
> > index ad1227df1984..8249621d11a6 100644
> > --- a/drivers/nvmem/core.c
> > +++ b/drivers/nvmem/core.c
> > @@ -952,9 +952,9 @@ nvmem_cell_get_from_lookup(struct device *dev, cons=
t char *con_id)
> >                   (strcmp(lookup->con_id, con_id) =3D=3D 0)) {
> >                       /* This is the right entry. */
> >                       nvmem =3D __nvmem_device_get(NULL, lookup->nvmem_=
name);
> > -                     if (!nvmem) {
> > +                     if (IS_ERR(nvmem)) {
> >                               /* Provider may not be registered yet. */
> > -                             cell =3D ERR_PTR(-EPROBE_DEFER);
> > +                             cell =3D (struct nvmem_cell *)nvmem;
>
> perhaps ERR_CAST() would better indicate the intent here?
>

Wow so that exists too...

Thanks, I'll resend tomorrow.

Bart

> >                               goto out;
> >                       }
> >
> > @@ -962,6 +962,7 @@ nvmem_cell_get_from_lookup(struct device *dev, cons=
t char *con_id)
> >                                                      lookup->cell_name)=
;
> >                       if (!cell) {
> >                               __nvmem_device_put(nvmem);
> > +                             cell =3D ERR_PTR(-ENOENT);
> >                               goto out;
> >                       }
> >               }
> >
>