From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751369AbcBKQN5 (ORCPT ); Thu, 11 Feb 2016 11:13:57 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:47057 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750778AbcBKQNz (ORCPT ); Thu, 11 Feb 2016 11:13:55 -0500 X-AuditID: cbfee61a-f79266d000003652-3c-56bcb340b903 From: Bartlomiej Zolnierkiewicz To: Viresh Kumar , "Rafael J. Wysocki" Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, Stephen Boyd , nm@ti.com, Greg Kroah-Hartman , Len Brown , open list , Pavel Machek , Viresh Kumar , Rafael Wysocki , Bartlomiej Zolnierkiewicz Subject: [PATCH] PM / OPP: Fix NULL pointer dereference when no regulator is defined Date: Thu, 11 Feb 2016 17:13:07 +0100 Message-id: <6387373.HWURUPOrgK@amdc1976> User-Agent: KMail/4.13.3 (Linux/3.13.0-74-generic; KDE/4.13.3; x86_64; ; ) MIME-version: 1.0 Content-transfer-encoding: 7Bit Content-type: text/plain; charset=us-ascii X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPLMWRmVeSWpSXmKPExsVy+t9jAV2HzXvCDDb3GFlsnLGe1aJ58Xo2 i1lT9jJZvD/0jNni8q45bBafe48wWrz5cZbJ4u6po2wWj1e8Zbc4c/oSq8WPM90sFhu/elhs fnCMzYHX43JfL5PH4j0vmTw2repk87hzbQ+bx/65a9g9bv97zOyx5Wo7i0ffllWMHsdvbGfy WLH6O7vH501yAdxRXDYpqTmZZalF+nYJXBnff15iKbjMVbHij1ID4xeOLkYODgkBE4mZnyq7 GDmBTDGJC/fWs3UxcnEICSxllGhfMYkFwvnKKLHi0Ac2kCo2ASuJie2rGEFsEYE4ic43x9lB bGaBPmaJrgspILawQJjE4w17GEEWsAioShyfZg4S5hXQlJi69BgriC0q4CWx485uJoi4oMSP yfdYIMbIS+zbP5UVwtaSWL/zONMERr5ZSMpmISmbhaRsASPzKkaJ1ILkguKk9FzDvNRyveLE 3OLSvHS95PzcTYzgaHkmtYPx4C73Q4wCHIxKPLwB9bvDhFgTy4orcw8xSnAwK4nw8i3YEybE m5JYWZValB9fVJqTWnyIUZqDRUmc9/H/dWFCAumJJanZqakFqUUwWSYOTqkGxsq9Igc5k1Jn l6j8KapJ/ylz64Ro0V9uWRYZ2WztGy8k+Exy2JJnqJ122HP4um+m+Z0kFhP1qw9F9QuaGybP DfjQ+dFIN+XNmr9aesHhq96v+HP+oJX0gveSdeUnAg1jMkS8REIaxK44SXn4Tt7inD5t4d1F HekvF3cXbXcOvKTp8n3m9OifSizFGYmGWsxFxYkAoE/EPJICAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 7d34d56ef334 ("PM / OPP: Disable OPPs that aren't supported by the regulator") causes NULL pointer dereference OOPS when no regulator for OPP is defined. Fix it by replacing IS_ERR() check with IS_ERR_OR_NULL() one (since providing regulator for OPP is optional). Cc: Viresh Kumar Cc: Stephen Boyd Cc: Rafael J. Wysocki Fixes: 7d34d56ef334 ("PM / OPP: Disable OPPs that aren't supported by the regulator") Signed-off-by: Bartlomiej Zolnierkiewicz --- This fixes linux-pm/linux-next tree boot hang regression on Exynos4412 SoC based Odroid-U3 board. Rafael, please apply. Thank you! drivers/base/power/opp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c index ab711c2..d7cd4e2 100644 --- a/drivers/base/power/opp/core.c +++ b/drivers/base/power/opp/core.c @@ -975,7 +975,7 @@ static bool _opp_supported_by_regulators(struct dev_pm_opp *opp, { struct regulator *reg = dev_opp->regulator; - if (!IS_ERR(reg) && + if (!IS_ERR_OR_NULL(reg) && !regulator_is_supported_voltage(reg, opp->u_volt_min, opp->u_volt_max)) { pr_warn("%s: OPP minuV: %lu maxuV: %lu, not supported by regulator\n", -- 1.9.1