Received-SPF: pass (google.com: domain of linux-kernel+bounces-21281-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 9 Jan 2024 12:58:53 -0600
From: Rob Herring <robh@kernel.org>
To: "Christian A. Ehrhardt" <lk@c--e.de>
Cc: Rob Herring <robh+dt@kernel.org>, linux-kernel@vger.kernel.org, Frank Rowand <frowand.list@gmail.com>, devicetree@vger.kernel.org, Stephen Boyd <stephen.boyd@linaro.org>
Subject: Re: [PATCH] of: Fix double free in of_parse_phandle_with_args_map
Message-ID: <170482604952.2932213.7130104450063134715.robh@kernel.org>
References: <20231229105411.1603434-1-lk@c--e.de>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231229105411.1603434-1-lk@c--e.de>


On Fri, 29 Dec 2023 11:54:11 +0100, Christian A. Ehrhardt wrote:
> In of_parse_phandle_with_args_map() the inner loop that
> iterates through the map entries calls of_node_put(new)
> to free the reference acquired by the previous iteration
> of the inner loop. This assumes that the value of "new" is
> NULL on the first iteration of the inner loop.
> 
> Make sure that this is true in all iterations of the outer
> loop by setting "new" to NULL after its value is assigned to "cur".
> 
> Extend the unittest to detect the double free and add an additional
> test case that actually triggers this path.
> 
> Fixes: bd6f2fd5a1 ("of: Support parsing phandle argument lists through a nexus node")
> Cc: Stephen Boyd <stephen.boyd@linaro.org>
> Signed-off-by: Christian A. Ehrhardt <lk@c--e.de>
> ---
>  drivers/of/base.c                           |  1 +
>  drivers/of/unittest-data/tests-phandle.dtsi | 10 ++-
>  drivers/of/unittest.c                       | 74 ++++++++++++---------
>  3 files changed, 53 insertions(+), 32 deletions(-)
> 

Applied, thanks!