From patchwork Tue Feb 18 09:42:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 231176 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 273E8C34033 for ; Tue, 18 Feb 2020 09:43:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0D862070B for ; Tue, 18 Feb 2020 09:43:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="L1flL6Xq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726225AbgBRJm7 (ORCPT ); Tue, 18 Feb 2020 04:42:59 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35500 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726264AbgBRJm7 (ORCPT ); Tue, 18 Feb 2020 04:42:59 -0500 Received: by mail-wr1-f67.google.com with SMTP id w12so23055690wrt.2 for ; Tue, 18 Feb 2020 01:42:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bJLLdBI8eSvzBXxk2WonDxxaPfclFHkWN/z2Zz+tXoI=; b=L1flL6XqWU4M7oQtBfIfwPtQhIvdy+VOqidwc+iCrhNvPHGfUWj8VoIwaGBvqG9Ur6 zcbcVnmJ6IdllG9BUggzYIbB71NMRJ2lkEK9y2nctzjtrtgj+4uMZgFi2iDdHiWi/tAP f/f6LFs464cgY+XJnpbqb9bhOulcr4g68CdzFkyrEc4AfLGl5KoKwQfKReOlVRSmhp4s kiSvssfv4h1nMnmvQtR2cG74FteQ0497Q4Ji0S+4Dd6MLMcve66TsBeGL4ZwuL/kcrWP XJhcn1q8vgmi04kNKt+nsH+SWLU6q9Si334XAJeQqyft2JNDCmjai0bQQZgBIJzcqrUf SxAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bJLLdBI8eSvzBXxk2WonDxxaPfclFHkWN/z2Zz+tXoI=; b=ngkiC+q9SDNHYcHFKKqIHWYMNtNrlAMC5FkoPvOVZrNdyGGmCCRF3xTl+F/XJS2Vbn 9qcFeTrPRm6fIblovWYtyNhxaFNeC9V1AmoY6IsNhZ5jlGUVChGk8vcGG2tylQ9fatrr O6nSpYa3ZGRsJEt8Rq0tlyT8fCU7s00mt/doOfcpH+PAMCmu9dIvkXfVziSNXMko0p8N QxFolc0O9zAO4Z6z3Ggr3hTHrzjY2+bNDhPJxzWtcpM+HdPNXsNVfvglKF7m03KDIRi7 H8nQyVA/Q3pPNS0yiMEyigfqp67bm2Ebf+WHuIkLoOjqgUyE9akoODdXPncjyhxv5uHW 9yfQ== X-Gm-Message-State: APjAAAV40tnGmFSwbg3yTQq612nHEKwkJWE0Qnu5bB5XCqRcQxjz1dKK TvraIrgwHmS9u91WDTt0TLEyjQ== X-Google-Smtp-Source: APXvYqz1nBzHiRJhepLQ/Wjne/xscI1ej8VHDh7ccYeXeFP7+XHWMd5f+Q3k2fAhEqceDdthDfeLKQ== X-Received: by 2002:adf:e781:: with SMTP id n1mr29596110wrm.56.1582018977732; Tue, 18 Feb 2020 01:42:57 -0800 (PST) Received: from localhost.localdomain (lfbn-nic-1-188-94.w2-15.abo.wanadoo.fr. [2.15.37.94]) by smtp.gmail.com with ESMTPSA id s23sm5351095wra.15.2020.02.18.01.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Feb 2020 01:42:57 -0800 (PST) From: Bartosz Golaszewski To: Linus Walleij , Srinivas Kandagatla , Khouloud Touil , Geert Uytterhoeven Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , stable@vger.kernel.org Subject: [PATCH v2 1/7] nvmem: fix memory leak in error path Date: Tue, 18 Feb 2020 10:42:28 +0100 Message-Id: <20200218094234.23896-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200218094234.23896-1-brgl@bgdev.pl> References: <20200218094234.23896-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bartosz Golaszewski We need to remove the ida mapping when returning from nvmem_register() with an error. Cc: Signed-off-by: Bartosz Golaszewski --- drivers/nvmem/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index ef326f243f36..b0be03d5f240 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -353,7 +353,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) - return ERR_CAST(nvmem->wp_gpio); + goto err_ida_remove; kref_init(&nvmem->refcnt); @@ -430,6 +430,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev); +err_ida_remove: + ida_simple_remove(&nvmem_ida, nvmem->id); return ERR_PTR(rval); }