linux-kernel - Re: [PATCH V2] nvmem: core: fix nvmem_layout_get_match

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <e9a83c52-67df-e448-2005-32fd735eceb1@linaro.org>
Date:   Fri, 20 Jan 2023 17:37:29 +0000
From:   Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
To:     Rafał Miłecki <zajec5@...il.com>
Cc:     Miquel Raynal <miquel.raynal@...tlin.com>,
        Michael Walle <michael@...le.cc>,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
        Rafał Miłecki <rafal@...ecki.pl>
Subject: Re: [PATCH V2] nvmem: core: fix nvmem_layout_get_match_data()



On 10/01/2023 20:43, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@...ecki.pl>
> 
> This function was trying to match wrong OF node (parent device's)
> against an of_match_table. It was always returning NULL.
> 
> Make it match layout's OF node against layout's of_match_table.
> 
> Note: __maybe_unused is needed to avoid:
> warning: variable 'layout_np' set but not used [-Wunused-but-set-variable]
> (of_match_node() is no-op without CONFIG_OF).
> 
> Fixes: f5709a684a0a ("nvmem: core: introduce NVMEM layouts")
> Signed-off-by: Rafał Miłecki <rafal@...ecki.pl>
> Reviewed-by: Michael Walle <michael@...le.cc>

Applied thanks,

--srini
> ---
>   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 d112bb1328c1..d3be50ed2d0b 100644
> --- a/drivers/nvmem/core.c
> +++ b/drivers/nvmem/core.c
> @@ -824,9 +824,11 @@ EXPORT_SYMBOL_GPL(of_nvmem_layout_get_container);
>   const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
>   					struct nvmem_layout *layout)
>   {
> +	struct device_node __maybe_unused *layout_np;
>   	const struct of_device_id *match;
>   
> -	match = of_match_node(layout->of_match_table, nvmem->dev.of_node);
> +	layout_np = of_nvmem_layout_get_container(nvmem);
> +	match = of_match_node(layout->of_match_table, layout_np);
>   
>   	return match ? match->data : NULL;
>   }