From patchwork Fri Jan 27 10:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 49179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp763471wrn; Fri, 27 Jan 2023 02:42:25 -0800 (PST) X-Google-Smtp-Source: AK7set9/h8Bxl7fSabdKFzuIgn1Im2EzcmRGNU+ihrK0+NFpqHCwoaOKvD05HcFQeho8JSO3jtQs X-Received: by 2002:a05:6a20:d04b:b0:bb:eea0:c877 with SMTP id hv11-20020a056a20d04b00b000bbeea0c877mr6475644pzb.59.1674816145310; Fri, 27 Jan 2023 02:42:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674816145; cv=none; d=google.com; s=arc-20160816; b=remX6Bo4CZTfaE9lAoRtSZ/dxeNIdlJjI6Yxel5iffEFsOgg1If5lAL9VoUS7r8CoI MVbTFYZinIkcvxj9VT6l7RgdjlHlEJhacQ747/TospyQc7n9g6Mjm/OsdD+0Y/Uu9sR6 gLpTlgn+7+vdp6GwdUWv4qb8c2T5VqkG+LMrZSq4CSHtlibv1XfUlu2PKpxM8LOM50nA xpnRgBRER4EzIT/B8u8D+MUYbscMweOg3Gzh4k7JScH1vVsTdX8f2+C2NKnkp0B5AQb3 Sj4iJLC+aDDtlp/IwrhpegnoJeHiBAZo4KZBiq+iLH53TuPqzYUpML5DqilucGIQIeeE noBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1ee8M/Zfl0pOs8Tnpp0ye8rZhC7jbLJshdfxfwBd8N4=; b=1EG5J4xMcbWqyGU/2F5UulZzHmLsLwjhJTLI7H0CB5bIkKJkW497X4Kd6lHR22Bbwp KT0VrO9xCv6F9fC4UghBvr47iTKVdme9k22ef6X/k3mE2/3/3rY7rxMYHD4aZYyMIRGw D0G7p3OwLE34Xheq9M1/n2OldBWErRdZYHnuiQP/umK7AqUqDaiQBRRvT5X4zyyGCehr WdfPivEfzlN2osLUEFQuceH7/Ql755MhGUFXtK9EVvjTukIFcSGBFuHsMDFCJBDhRvUK yK+sfFYK1p8eUcRBJtEt0r/ZXtkuBCBA7nsJ33RnkIfQEW0VGeFCbLxZqYHx6rOkk8F1 psbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N554l+a4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t62-20020a628141000000b005752602f950si4101924pfd.208.2023.01.27.02.42.13; Fri, 27 Jan 2023 02:42:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N554l+a4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232287AbjA0Kkz (ORCPT + 99 others); Fri, 27 Jan 2023 05:40:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbjA0Kkk (ORCPT ); Fri, 27 Jan 2023 05:40:40 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC9FF68AC1 for ; Fri, 27 Jan 2023 02:40:29 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso5093061wmn.5 for ; Fri, 27 Jan 2023 02:40:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1ee8M/Zfl0pOs8Tnpp0ye8rZhC7jbLJshdfxfwBd8N4=; b=N554l+a4UV+5pp3GziZ82E2uFpGyeuI2jtL1QNcQGYgpzh5aSUxjUvIIiLbjIrld4C REZvNGQ2vU/7eosArZXgOoNYv3RBWM+XOdggo3BbrRjJJ9sDNVwv2Q2xd68Pi2hztqel tdT+A0vNpZyBZ8WsL5idXJQygTTSusA2UER5+8TJdregZCPUA88rcHaBTPiGATUKC/1g EkSoPO1TzRgpNJyc2YTqTpE8RHCAhm/BFGX2QDtSNLqwQbEaQUNkD6o6DQsG/5nk5sBu FwQmlldnm7sPp79qOrrsdMMrCZW95X3k82j/wbiUeV/YNJP1wxwLMtrQUf69+vLUeg1Y 7Qqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1ee8M/Zfl0pOs8Tnpp0ye8rZhC7jbLJshdfxfwBd8N4=; b=q4Nt04CLBxoG7L2KcmWhTSA8y3sPdcPdXh3JJHEIlmpmbMt4CaBfdUuucvn6dngqnY LsWRp0UqctOYJIFa3oFltb4rGWVkejLsE8f6U0bDAiVNEt+YtX9TU4SH+GlQFGeBQ/+/ 1Ni01UztWtm8Dm7c0jxlNr1EsuwbLft+1PJ5rzcqqD3MuA0Uwc27ES5USduHY2m2S+UK bjVyqMmrSH156aWjGgL/P27yunJX4Npds/5SXbnUw+nhiBbuVQqxAXcFmC+pbEoAOyw0 Aew5nvP3Xdj++DPIxVGOckUi3ZEpOIySzxEn/n/7hvg3uR1OQQL9Y/C3lYLWb9q0+W1e BvNQ== X-Gm-Message-State: AFqh2kr6Ecy1rPrjxMjC585l9AnS5OJiznJzm3cPyj/ns1vCtK0kxRMD ueBByQwJkB/zXVuX4PtpRoIIlQ== X-Received: by 2002:a05:600c:4395:b0:3c6:f7ff:6f87 with SMTP id e21-20020a05600c439500b003c6f7ff6f87mr37673436wmn.11.1674816028506; Fri, 27 Jan 2023 02:40:28 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id q9-20020a1ce909000000b003dc34edacf8sm1619787wmc.31.2023.01.27.02.40.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 02:40:27 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, "Russell King (Oracle)" , stable@vger.kernel.org, kernel test robot , Dan Carpenter , Srinivas Kandagatla Subject: [PATCH 05/10] nvmem: core: fix cleanup after dev_set_name() Date: Fri, 27 Jan 2023 10:40:10 +0000 Message-Id: <20230127104015.23839-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> References: <20230127104015.23839-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756172014140563301?= X-GMAIL-MSGID: =?utf-8?q?1756172014140563301?= From: "Russell King (Oracle)" If dev_set_name() fails, we leak nvmem->wp_gpio as the cleanup does not put this. While a minimal fix for this would be to add the gpiod_put() call, we can do better if we split device_register(), and use the tested nvmem_release() cleanup code by initialising the device early, and putting the device. This results in a slightly larger fix, but results in clear code. Note: this patch depends on "nvmem: core: initialise nvmem->id early" and "nvmem: core: remove nvmem_config wp_gpio". Cc: stable@vger.kernel.org Fixes: 5544e90c8126 ("nvmem: core: add error handling for dev_set_name") Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Russell King (Oracle) [Srini: Fixed subject line and error code handing with wp_gpio while applying.] Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 608f3ad2e2e4..ac77a019aed7 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -772,14 +772,18 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->id = rval; + nvmem->dev.type = &nvmem_provider_type; + nvmem->dev.bus = &nvmem_bus_type; + nvmem->dev.parent = config->dev; + + device_initialize(&nvmem->dev); + if (!config->ignore_wp) nvmem->wp_gpio = gpiod_get_optional(config->dev, "wp", GPIOD_OUT_HIGH); if (IS_ERR(nvmem->wp_gpio)) { - ida_free(&nvmem_ida, nvmem->id); rval = PTR_ERR(nvmem->wp_gpio); - kfree(nvmem); - return ERR_PTR(rval); + goto err_put_device; } kref_init(&nvmem->refcnt); @@ -791,9 +795,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->stride = config->stride ?: 1; nvmem->word_size = config->word_size ?: 1; nvmem->size = config->size; - nvmem->dev.type = &nvmem_provider_type; - nvmem->dev.bus = &nvmem_bus_type; - nvmem->dev.parent = config->dev; nvmem->root_only = config->root_only; nvmem->priv = config->priv; nvmem->type = config->type; @@ -821,11 +822,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) break; } - if (rval) { - ida_free(&nvmem_ida, nvmem->id); - kfree(nvmem); - return ERR_PTR(rval); - } + if (rval) + goto err_put_device; nvmem->read_only = device_property_present(config->dev, "read-only") || config->read_only || !nvmem->reg_write; @@ -836,7 +834,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - rval = device_register(&nvmem->dev); + rval = device_add(&nvmem->dev); if (rval) goto err_put_device;