From patchwork Fri Jan 27 11:15:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 49209 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp778640wrn; Fri, 27 Jan 2023 03:21:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXsGNtYZvHBMCnL+8Nmo/8fi0Z/UnFWCOrBB0LfzS95CuiqQrDRD5YBfhAUums4UrdUdGhjN X-Received: by 2002:a05:6a20:4294:b0:b5:a64d:a181 with SMTP id o20-20020a056a20429400b000b5a64da181mr52571174pzj.19.1674818513978; Fri, 27 Jan 2023 03:21:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674818513; cv=none; d=google.com; s=arc-20160816; b=TcTNZB3nBXVuUQrDpyr3ZInLciAMwJcnNctCuqlkqxTQg9ttWIxjExIrbKO3agufsz osITj+sxaenVBofrF9Fs02Vzte/opzcccx+7w+WXyxOgcEZLi9QpZ9rMemxBgqKpHq8d ZIJaSRnaLS7WmuaFwKsswbYxFwPmlHExmzrFGqiZt3rRLnhTMCFNH4BA8hG9xx4EGUqh LmohpOXZQVLHCoHZTwj0wP2Q4AuVXEGQwr09ing3jMtZzMDMn8z3Vi4UpOqgNtyfReiC vwsfPqZNzWg5YFWg1rTP+WQKZ2iGE5lTWHDKqfTThDWol4ZsYFET9V67Fs7MvnDeUIPQ /xVg== 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=y5cQYAWnc8iQ0UrchsvjPr/IR5ASImNBAqD3wKXZO3g=; b=RFH60VbztFxhyjjUYoWz4/0ehA3PpJBUApG1Ga5Hu3EmLtJDSyQro0EyzbUOc4dOsi 4DOtVyqlD3DB5YpUp1msOp6kR9Vih2b+U9EU1lrlBAFb/gWwIwBOUhiqZOk9+16TmNNy ZqwkhUVWp5D98fhvbJTcPWUQke+wdFNfLDYtQ85XQi/1It7ubudvEzqbKu3TzkztXFwa HzJD+67C+ihMN5zKFmoU/CkzQvNLMfpnZEf2QxKNv7SSkGeqlTukmdDy9SF7+CLjgdQe taA4X9hjXAfIwI1NoluO82fjYrAFGXADzpo90cqMMZ0QwIIn1/pjGn+ebI8DL/ogKoz6 akug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cY/6mrjF"; 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 204-20020a6301d5000000b004d2621d6a71si3828015pgb.635.2023.01.27.03.21.41; Fri, 27 Jan 2023 03:21:53 -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="cY/6mrjF"; 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 S231923AbjA0LTf (ORCPT + 99 others); Fri, 27 Jan 2023 06:19:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232738AbjA0LSi (ORCPT ); Fri, 27 Jan 2023 06:18:38 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4255B1286C for ; Fri, 27 Jan 2023 03:18:18 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id b7so4678281wrt.3 for ; Fri, 27 Jan 2023 03:18:18 -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=y5cQYAWnc8iQ0UrchsvjPr/IR5ASImNBAqD3wKXZO3g=; b=cY/6mrjFUq0WtDE7zWolaFcIY/oeOsBT9GGOMoO/gi8hILJXxphqdTTa/B5+NxTDoJ 30PoRcdzHo2uKwATYyINDslTkoDCoPLeHN2MUxlsZ+y3sm9Ud02Rxleoz5XpMDwhkdXq DLNmGqoAa1I0oRauqJLYbUTHe/9D1IzYyTOvvSacnVfxxrnbokm4teCimaIedh2+5o3f OmT/+4Y/HNpMTTxmopaXt6ohtIVpdXFkQaYyyOQZKolDGzfaI5FCk085VP+3CC2wR0qN 2Bb1bXUYyVdiADDqLP9X5wRJwhDWHNjcqKAeo4+7E3SdHnSEiJR4MNIiMKftTJ72WAa+ H5eg== 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=y5cQYAWnc8iQ0UrchsvjPr/IR5ASImNBAqD3wKXZO3g=; b=qiGGfwjvg/1nScB81PW+mbkK4ey6OrQal4/GEv+Yr8iHhHtDB4J+9AhE5TfFmU5JiK JZ4J2FHCjJmoGXip7sl9jF9iCq5mjX6y/EvKBVCQBezhsral83PhzHqLu4u+YBA5EG2A 5Bj9VuHubTuIaR87NlPMc26BNWQ4Qgc6cqWZ+AbHm+h3+brofsAM5m44uUMBzN/Yri1Y iNu/Bp43tM55FnGjFY3l2NGC6x8kqL55ynBPqlhQG6nVPYBMoPpZTxriwyWZHf8bB/01 mRmhWLhonVcp5kGNhYuZkeW3E9iukd1ORPx5V1nYCYeXrcCUdjLF0ojNbP1XbK6K69s6 r4VA== X-Gm-Message-State: AFqh2kqFNXKEhqpUPoEQbkoxF6t+91Mc2Elp8RrqmgHjCGtvae3wlmqD PlFBZqvK07+TjmjgrA0cIRbEAHJWah6QzH0H X-Received: by 2002:a5d:5190:0:b0:2bd:fde4:885c with SMTP id k16-20020a5d5190000000b002bdfde4885cmr32337324wrv.63.1674818296362; Fri, 27 Jan 2023 03:18:16 -0800 (PST) Received: from localhost.localdomain ([5.133.47.210]) by smtp.gmail.com with ESMTPSA id c13-20020adffb0d000000b002bfd190fd60sm1843314wrr.108.2023.01.27.03.18.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Jan 2023 03:18:15 -0800 (PST) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, Michael Walle , Alexander Stein , Srinivas Kandagatla Subject: [PATCH 27/37] nvmem: core: return -ENOENT if nvmem cell is not found Date: Fri, 27 Jan 2023 11:15:55 +0000 Message-Id: <20230127111605.25958-28-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127111605.25958-1-srinivas.kandagatla@linaro.org> References: <20230127111605.25958-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?1756174498461047765?= X-GMAIL-MSGID: =?utf-8?q?1756174498461047765?= From: Michael Walle Prior to commit 3cb05fdbaed6 ("nvmem: core: add an index parameter to the cell") of_nvmem_cell_get() would return -ENOENT if the cell wasn't found. Particularly, if of_property_match_string() returned -EINVAL, that return code was passed as the index to of_parse_phandle(), which then detected it as invalid and returned NULL. That led to an return code of -ENOENT. With the new code, the negative index will lead to an -EINVAL of of_parse_phandle_with_optional_args() which pass straight to the caller and break those who expect an -ENOENT. Fix it by always returning -ENOENT. Fixes: e894d5ad177c ("nvmem: core: add an index parameter to the cell") Reported-by: Alexander Stein Signed-off-by: Michael Walle Tested-by: Alexander Stein Signed-off-by: Srinivas Kandagatla --- drivers/nvmem/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 81ad6a4c4f86..30057b0094a2 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1346,7 +1346,7 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np, const char *id) "#nvmem-cell-cells", index, &cell_spec); if (ret) - return ERR_PTR(ret); + return ERR_PTR(-ENOENT); if (cell_spec.args_count > 1) return ERR_PTR(-EINVAL);