From patchwork Fri Mar 20 17:20:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King X-Patchwork-Id: 6058781 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C7C6DBF90F for ; Fri, 20 Mar 2015 17:20:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EA6352051D for ; Fri, 20 Mar 2015 17:20:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07EF520520 for ; Fri, 20 Mar 2015 17:20:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750916AbbCTRU4 (ORCPT ); Fri, 20 Mar 2015 13:20:56 -0400 Received: from pandora.arm.linux.org.uk ([78.32.30.218]:59748 "EHLO pandora.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbbCTRU4 (ORCPT ); Fri, 20 Mar 2015 13:20:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References:In-Reply-To; bh=GQiYAEsFybxkhAgL3effIywtVBkkMH13FTyeFsPH+LY=; b=JZKEC7/feb7MH3peii1vXWpy/QNhDcYGhWXFUsF+4yX5kH0cM1ItJkuPkWzFd5+ImJAJeM1vodvSFvoxk24/P8eyVaVw94g/ZHIfPWb/yOPqy7xHt3c9h6MmksJMTlIBL8u2FH7gqj6K7gs4uobAtH210LtLqjrP7u5VIjATSC4=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:37220 helo=rmk-PC.arm.linux.org.uk) by pandora.arm.linux.org.uk with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1YZ0bF-0006Fr-Ub; Fri, 20 Mar 2015 17:20:46 +0000 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1YZ0b8-0000ss-Nq; Fri, 20 Mar 2015 17:20:38 +0000 In-Reply-To: <20150320171941.GK8656@n2100.arm.linux.org.uk> References: <20150320171941.GK8656@n2100.arm.linux.org.uk> From: Russell King To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson Cc: Greg Kroah-Hartman , Len Brown , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] pm: domains: avoid potential oops in pm_genpd_remove_device() MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Fri, 20 Mar 2015 17:20:38 +0000 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP pm_genpd_remove_device() tries hard to validate the generic PM domain passed to it, but the validation is not complete. dev->pm_domain contains a struct dev_pm_domain, which is the "base class" of generic PM domains. Other users of dev_pm_domains include stuff like vga_switheroo. Hence, a device could have a generic PM domain or a vga_switcheroo PM domain in dev->pm_domain. We need ot be certain that the PM domain is actually valid before we try to remove it. We can do this easily as we have a way to get the current validated generic PM domain for a struct device. This must match the generic PM domain being requested for removal. Convert the code to use this alternative validation method instead. Acked-by: Kevin Hilman Signed-off-by: Russell King Acked-by: Ulf Hansson --- drivers/base/power/domain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 89d2eea7f561..5f560fa45a32 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1538,9 +1538,7 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, dev_dbg(dev, "%s()\n", __func__); - if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev) - || IS_ERR_OR_NULL(dev->pm_domain) - || pd_to_genpd(dev->pm_domain) != genpd) + if (!genpd || genpd != pm_genpd_lookup_dev(dev)) return -EINVAL; genpd_acquire_lock(genpd);