From patchwork Mon Feb 27 08:52:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 61877 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2311630wrd; Mon, 27 Feb 2023 01:07:23 -0800 (PST) X-Google-Smtp-Source: AK7set9k7Ia6DUjFuNilwSO6U/z0GsmyjBsM5ny/GXS1qx8jNxGO7X18/6D3cdqC1JBHO2zvVDkk X-Received: by 2002:a17:907:94c5:b0:8f7:68ca:c004 with SMTP id dn5-20020a17090794c500b008f768cac004mr12145432ejc.64.1677488843726; Mon, 27 Feb 2023 01:07:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677488843; cv=none; d=google.com; s=arc-20160816; b=YrBvjKgPuAvWS5Cdty2rm2igX8QexU6zW/DQ7B/ttDncIkSKTJMoZFOKhuc6jk/D5d jMN2ft9Mk4wOlbJmLPsGpR/8uYPcqDgYN6GvOq9ZmFxQZ8HvTEvc9Yz77G/JQzs2JF0d aFHneKJOwmGpLeKUDYA1QEDwdlKUc3m4WDXtwgd97NJ4jU8M+TEk+y6Tvgct3WaiLNNP 6ow0JV/NwbwjyHwf4bzsH+z0/1Nkw0uu3qIhNrgUUuDB3V54GvHERXcrg+qs9pO2HP4P 7R9Irk9Q/bVOaHthgcjEDVe8zz3mFxk4qLS/myFTgRS1ZgDBWHoUXPX5dWzzBuIa7hPI WFcQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=8FIt0EVof2ywHvSQWJdF3omOOcuzKr09oKXuq/wVTQo=; b=r/r8xCS+ESfUP9ZyXxXkey0Hz5b6ZCj7zQrWazabMWY4ePQ/cZ1IKu/IjYvqOJtZZU xkLvwLzB23qyLUxWLo3O7tmz6b0sxnz/1HSbH/DdK7eOOBsR5TgDXh9ltIGIrOIo9+TS Tm0NS0rbmVX1mg9sNNgF3kru5gwKXFYldRRLd/Di0f9N+L2rCntmDq85XWXJ5uHru4Dh dg1IX2MwSCTDY2A3DuGZ6jsj6Wl+DdcPBUOAXmlwF9/XJdUejiGCuRsuhFGsm93gO//V 42HLbmV1FgjF0fu3s0H8KqeoFDdPz+WRXpY++sEE4QSG2gZ9VQv98UJoQDJ9yKD0c6kM Gybg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2022082101 header.b=B3N9UBLr; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=walle.cc Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e20-20020a170906845400b008b1801cac0dsi7080066ejy.417.2023.02.27.01.07.01; Mon, 27 Feb 2023 01:07:23 -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=@walle.cc header.s=mail2022082101 header.b=B3N9UBLr; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=walle.cc Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229752AbjB0JFt (ORCPT + 99 others); Mon, 27 Feb 2023 04:05:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229722AbjB0JFa (ORCPT ); Mon, 27 Feb 2023 04:05:30 -0500 Received: from mail.3ffe.de (0001.3ffe.de [IPv6:2a01:4f8:c0c:9d57::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 953BF2B63C for ; Mon, 27 Feb 2023 00:56:01 -0800 (PST) Received: from mwalle01.kontron.local. (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.3ffe.de (Postfix) with ESMTPSA id BC208315; Mon, 27 Feb 2023 09:55:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1677488100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8FIt0EVof2ywHvSQWJdF3omOOcuzKr09oKXuq/wVTQo=; b=B3N9UBLrbK5CQYPxyaBkjf4AdFobcfBZhRXIrUgtBkegnb3xNCiiWohid8rSevfiDj8aIQ nlMnkrvM4J5FjgF48WsJVEkwUVbmQroxmCT6WwQwtWn23ut7MG//hkQGKWpZN1QT7G3CWn umKE/6errmp4gNMqpcJH5wLcbU1ekWM4kVTNhQIusn8BjJyGXb9/PddQbKHDhlWgUEiPwA G8z5o2kqUK2VeRK8n8EEJmcJh/TsmWyQ2sKyGliuIOi0kz47m9ibwCWHv6SXUeJ3U0tnoL NjMKvZgeXuSFPXECXvXIAOdqwOIH+gNq9BpKXDABSpob3pZ9vt2uS6Ex3hyolw== From: Michael Walle To: Srinivas Kandagatla , Greg Kroah-Hartman , Alexander Stein , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= Cc: linux-kernel@vger.kernel.org, Michael Walle Subject: [PATCH v2 RESEND] nvmem: core: return -ENOENT if nvmem cell is not found Date: Mon, 27 Feb 2023 09:52:07 +0100 Message-Id: <20230227085207.85381-1-michael@walle.cc> X-Mailer: git-send-email 2.30.2 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,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?1758974541407524583?= X-GMAIL-MSGID: =?utf-8?q?1758974541407524583?= Prior to commit 5d8e6e6c10a3 ("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: 5d8e6e6c10a3 ("nvmem: core: add an index parameter to the cell") Reported-by: Alexander Stein Link: https://lore.kernel.org/r/2143916.GUh0CODmnK@steina-w/ Signed-off-by: Michael Walle Tested-by: Alexander Stein --- Updated the commit ids as they are in Linus' tree. Added the link to the report. 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 174ef3574e07..22024b830788 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -1231,7 +1231,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);