| Message ID | 20240814195823.437597-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [1/3] thermal: of: Fix OF node leak in thermal_of_trips_init() error path | expand |
On Wed, Aug 14, 2024 at 09:58:21PM +0200, Krzysztof Kozlowski wrote: > Terminating for_each_child_of_node() loop requires dropping OF node > reference, so bailing out after thermal_of_populate_trip() error misses > this. Solve the OF node reference leak with scoped > for_each_child_of_node_scoped(). > > Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> > --- > drivers/thermal/thermal_of.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c > index aa34b6e82e26..30f8d6e70484 100644 > --- a/drivers/thermal/thermal_of.c > +++ b/drivers/thermal/thermal_of.c > @@ -125,7 +125,7 @@ static int thermal_of_populate_trip(struct device_node *np, > static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *ntrips) > { > struct thermal_trip *tt; > - struct device_node *trips, *trip; > + struct device_node *trips; > int ret, count; > > trips = of_get_child_by_name(np, "trips"); > @@ -150,7 +150,7 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n > *ntrips = count; > > count = 0; > - for_each_child_of_node(trips, trip) { > + for_each_child_of_node_scoped(trips, trip) { > ret = thermal_of_populate_trip(trip, &tt[count++]); > if (ret) > goto out_kfree; > -- > 2.43.0 >
> Terminating for_each_child_of_node() loop requires dropping OF node
…
Can a cover letter be helpful for such patch series?
Regards,
Markus
On 14/08/2024 21:58, Krzysztof Kozlowski wrote: > Terminating for_each_child_of_node() loop requires dropping OF node > reference, so bailing out after thermal_of_populate_trip() error misses > this. Solve the OF node reference leak with scoped > for_each_child_of_node_scoped(). > > Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Applied, thanks for the fixes
On Mon, Aug 19, 2024 at 12:12 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 14/08/2024 21:58, Krzysztof Kozlowski wrote: > > Terminating for_each_child_of_node() loop requires dropping OF node > > reference, so bailing out after thermal_of_populate_trip() error misses > > this. Solve the OF node reference leak with scoped > > for_each_child_of_node_scoped(). > > > > Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") > > Cc: <stable@vger.kernel.org> > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Applied, thanks for the fixes Is there a place from which I can pull these? It would be good to include them into 6.11 as they are -stable material. Alternatively, I can pick them up from the list.
On 19/08/2024 15:20, Rafael J. Wysocki wrote: > On Mon, Aug 19, 2024 at 12:12 PM Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: >> >> On 14/08/2024 21:58, Krzysztof Kozlowski wrote: >>> Terminating for_each_child_of_node() loop requires dropping OF node >>> reference, so bailing out after thermal_of_populate_trip() error misses >>> this. Solve the OF node reference leak with scoped >>> for_each_child_of_node_scoped(). >>> >>> Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") >>> Cc: <stable@vger.kernel.org> >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> --- >> >> Applied, thanks for the fixes > > Is there a place from which I can pull these? > > It would be good to include them into 6.11 as they are -stable material. > > Alternatively, I can pick them up from the list. I'll send a PR for fixes only. Let me double check if there are other fixes to go along with those
On Mon, Aug 19, 2024 at 3:22 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 19/08/2024 15:20, Rafael J. Wysocki wrote: > > On Mon, Aug 19, 2024 at 12:12 PM Daniel Lezcano > > <daniel.lezcano@linaro.org> wrote: > >> > >> On 14/08/2024 21:58, Krzysztof Kozlowski wrote: > >>> Terminating for_each_child_of_node() loop requires dropping OF node > >>> reference, so bailing out after thermal_of_populate_trip() error misses > >>> this. Solve the OF node reference leak with scoped > >>> for_each_child_of_node_scoped(). > >>> > >>> Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") > >>> Cc: <stable@vger.kernel.org> > >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>> --- > >> > >> Applied, thanks for the fixes > > > > Is there a place from which I can pull these? > > > > It would be good to include them into 6.11 as they are -stable material. > > > > Alternatively, I can pick them up from the list. > > I'll send a PR for fixes only. Let me double check if there are other > fixes to go along with those Sure, thanks!
On Mon, Aug 19, 2024 at 3:31 PM Rafael J. Wysocki <rafael@kernel.org> wrote: > > On Mon, Aug 19, 2024 at 3:22 PM Daniel Lezcano > <daniel.lezcano@linaro.org> wrote: > > > > On 19/08/2024 15:20, Rafael J. Wysocki wrote: > > > On Mon, Aug 19, 2024 at 12:12 PM Daniel Lezcano > > > <daniel.lezcano@linaro.org> wrote: > > >> > > >> On 14/08/2024 21:58, Krzysztof Kozlowski wrote: > > >>> Terminating for_each_child_of_node() loop requires dropping OF node > > >>> reference, so bailing out after thermal_of_populate_trip() error misses > > >>> this. Solve the OF node reference leak with scoped > > >>> for_each_child_of_node_scoped(). > > >>> > > >>> Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") > > >>> Cc: <stable@vger.kernel.org> > > >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > >>> --- > > >> > > >> Applied, thanks for the fixes > > > > > > Is there a place from which I can pull these? > > > > > > It would be good to include them into 6.11 as they are -stable material. > > > > > > Alternatively, I can pick them up from the list. > > > > I'll send a PR for fixes only. Let me double check if there are other > > fixes to go along with those > > Sure, thanks! Sorry for pressing, but it would be good to get this material into -rc5. I can still pick up the patches, I don't believe they are controversial.
On 22/08/2024 17:54, Rafael J. Wysocki wrote: > On Mon, Aug 19, 2024 at 3:31 PM Rafael J. Wysocki <rafael@kernel.org> wrote: >> >> On Mon, Aug 19, 2024 at 3:22 PM Daniel Lezcano >> <daniel.lezcano@linaro.org> wrote: >>> >>> On 19/08/2024 15:20, Rafael J. Wysocki wrote: >>>> On Mon, Aug 19, 2024 at 12:12 PM Daniel Lezcano >>>> <daniel.lezcano@linaro.org> wrote: >>>>> >>>>> On 14/08/2024 21:58, Krzysztof Kozlowski wrote: >>>>>> Terminating for_each_child_of_node() loop requires dropping OF node >>>>>> reference, so bailing out after thermal_of_populate_trip() error misses >>>>>> this. Solve the OF node reference leak with scoped >>>>>> for_each_child_of_node_scoped(). >>>>>> >>>>>> Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") >>>>>> Cc: <stable@vger.kernel.org> >>>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>>>>> --- >>>>> >>>>> Applied, thanks for the fixes >>>> >>>> Is there a place from which I can pull these? >>>> >>>> It would be good to include them into 6.11 as they are -stable material. >>>> >>>> Alternatively, I can pick them up from the list. >>> >>> I'll send a PR for fixes only. Let me double check if there are other >>> fixes to go along with those >> >> Sure, thanks! > > Sorry for pressing, but it would be good to get this material into -rc5. > > I can still pick up the patches, I don't believe they are controversial. Ok, feel free to pick them. Give me a few minutes to add my tags
On 14/08/2024 21:58, Krzysztof Kozlowski wrote: > Terminating for_each_child_of_node() loop requires dropping OF node > reference, so bailing out after thermal_of_populate_trip() error misses > this. Solve the OF node reference leak with scoped > for_each_child_of_node_scoped(). > > Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c index aa34b6e82e26..30f8d6e70484 100644 --- a/drivers/thermal/thermal_of.c +++ b/drivers/thermal/thermal_of.c @@ -125,7 +125,7 @@ static int thermal_of_populate_trip(struct device_node *np, static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *ntrips) { struct thermal_trip *tt; - struct device_node *trips, *trip; + struct device_node *trips; int ret, count; trips = of_get_child_by_name(np, "trips"); @@ -150,7 +150,7 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n *ntrips = count; count = 0; - for_each_child_of_node(trips, trip) { + for_each_child_of_node_scoped(trips, trip) { ret = thermal_of_populate_trip(trip, &tt[count++]); if (ret) goto out_kfree;
Terminating for_each_child_of_node() loop requires dropping OF node reference, so bailing out after thermal_of_populate_trip() error misses this. Solve the OF node reference leak with scoped for_each_child_of_node_scoped(). Fixes: d0c75fa2c17f ("thermal/of: Initialize trip points separately") Cc: <stable@vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/thermal/thermal_of.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)