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=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 AE255C34050 for ; Wed, 19 Feb 2020 10:52:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8542824656 for ; Wed, 19 Feb 2020 10:52:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="J4R47UwD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726766AbgBSKwY (ORCPT ); Wed, 19 Feb 2020 05:52:24 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39229 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726495AbgBSKwY (ORCPT ); Wed, 19 Feb 2020 05:52:24 -0500 Received: by mail-wr1-f68.google.com with SMTP id y11so27621777wrt.6 for ; Wed, 19 Feb 2020 02:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=lt0NY5ib1Jfzy6tElePJc/SbaXVWZpjySCmieUMPpiA=; b=J4R47UwDGmz+YjGbKXDX5CSCOZO416NJh6ZdqrxFKG3dhVEUsE3rOv1EF8B+Y0iK3q bsAwG3EeaVeX+IyXwpE7L/9wnR807IGNztzxmqCG+FpwrRKwiqUCnGtY5lsp9rM3tizK symTQZXecIKJZdkEExDae2REdzOidfh6IJH2KAITdcgOK0E2OT+I/V0FjmI2CZkhmPZk HsWCrOE44uICeo36LlKHQkB26Bm0LnJRpKN41aLb4wxAmzemJ9M55qSaNKWKA2PQ0I8y fgocye9J0gLkdY02OJ8zNS3SBSK/6saMb2e/ypV11YVYGCbhZ9jejZUJWEMsgpX7HbJz eICA== 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=lt0NY5ib1Jfzy6tElePJc/SbaXVWZpjySCmieUMPpiA=; b=nl+eXs/osxJEpt5S5ez0BW5YofL7Cb+stpWvVM8KrFzDVpxLO8AADjZPfekFEAm1Cg jzCPD6ExIY4lN7jOUP0OemJt/+XgrZ8rH905ZN+Z5/TwOfglqZML8tjZFUHNuRepX+rA jo6ZJM+yY+UrHbKwg684oyRW9RFtsrQzAp5O4q2hyA6xPDOYe8AHj65v5bxl1ColRVzy epIeSniv4VheD/QXWrSsKMHOx+soYIg/nax2jB7CaejyKTc5pA7fn0w8S48PuUqU/r4p 768TX8fHpvBDJljv2Disxrhn7Rpdk/WkIvdD/9pixGq/eqb7x5hA6cPKkswV1e9V4u3h KiuQ== X-Gm-Message-State: APjAAAUZ66aWaVXTehE4/soxPERIhS2ZUVW/60/O8n76JAIiFMsMbVXc fYVQShwxv/cx+ciB3N0KFHdvbVPozDw= X-Google-Smtp-Source: APXvYqxaU/hV+JRB683FKtQ1VLsdZn0+2CYY0PgX0KgoVd13wMkS8esIg98BvQAndfE6+8aniFhDyw== X-Received: by 2002:a5d:5381:: with SMTP id d1mr34595050wrv.259.1582109542207; Wed, 19 Feb 2020 02:52:22 -0800 (PST) Received: from [192.168.86.34] (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.googlemail.com with ESMTPSA id z133sm2623662wmb.7.2020.02.19.02.52.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Feb 2020 02:52:21 -0800 (PST) Subject: Re: [PATCH v3 1/7] nvmem: fix memory leak in error path To: Bartosz Golaszewski , Linus Walleij , Khouloud Touil , Geert Uytterhoeven Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski References: <20200219092218.18143-1-brgl@bgdev.pl> <20200219092218.18143-2-brgl@bgdev.pl> From: Srinivas Kandagatla Message-ID: Date: Wed, 19 Feb 2020 10:52:20 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20200219092218.18143-2-brgl@bgdev.pl> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org On 19/02/2020 09:22, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski > > We need to free the ida mapping and nvmem struct if the write-protect > GPIO lookup fails. > > Fixes: 2a127da461a9 ("nvmem: add support for the write-protect pin") > Signed-off-by: Bartosz Golaszewski > --- > drivers/nvmem/core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c > index ef326f243f36..89974e40d250 100644 > --- a/drivers/nvmem/core.c > +++ b/drivers/nvmem/core.c > @@ -352,8 +352,11 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) > else > nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", > GPIOD_OUT_HIGH); > - if (IS_ERR(nvmem->wp_gpio)) > - return ERR_CAST(nvmem->wp_gpio); > + if (IS_ERR(nvmem->wp_gpio)) { > + ida_simple_remove(&nvmem_ida, nvmem->id); > + kfree(nvmem); > + return ERR_PTR(rval); Why are you returning rval here? This points return value of ida_simple_get and not the actual error code from wp_gpio. --srini > + }