Skip to contentSkip to conversation

Patch "clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference" has been added to the 4.1-stable tree

PATCH [email protected] 1 participant 1 message Jul 31, 2015

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference

to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
clk-ti-dra7-atl-clock-fix-possible-err_ptr-dereference.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e0cdcda508f110b7ec190dc7c5eb2869ba73a535 Mon Sep 17 00:00:00 2001

From: Krzysztof Kozlowski <[email protected]>
Date: Wed, 13 May 2015 15:54:40 +0900
Subject: clk: ti: dra7-atl-clock: Fix possible ERR_PTR dereference

From: Krzysztof Kozlowski <[email protected]>

commit e0cdcda508f110b7ec190dc7c5eb2869ba73a535 upstream.

of_clk_get_from_provider() returns ERR_PTR on failure. The dra7-atl-clock driver was not checking its return value and immediately used it in __clk_get_hw(). __clk_get_hw() dereferences supplied clock, if it is not NULL, so in that case it would dereference an ERR_PTR.

Fixes 9ac33b0ce81f ("CLK: TI: Driver for DRA7 ATL (Audio Tracking Logic)")
---
 drivers/clk/ti/clk-dra7-atl.c |    5 +++++
 1 file changed, 5 insertions(+)
drivers/clk/ti/clk-dra7-atl.c +5 -0
@@ -252,6 +252,11 @@ static int of_dra7_atl_clk_probe(struct
 		}
 
 		clk = of_clk_get_from_provider(&clkspec);
+		if (IS_ERR(clk)) {
+			pr_err("%s: failed to get atl clock %d from provider\n",
+			       __func__, i);
+			return PTR_ERR(clk);
+		}
 
 		cdesc = to_atl_desc(__clk_get_hw(clk));
 		cdesc->cinfo = cinfo;

Patches currently in stable-queue which might be from [email protected] are

queue-4.1/clk-ti-dra7-atl-clock-fix-possible-err_ptr-dereference.patch queue-4.1/clocksource-exynos_mct-avoid-blocking-calls-in-the-cpu-hotplug-notifier.patch