From patchwork Tue May 30 09:55:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13259642 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 64AF7C77B7A for ; Tue, 30 May 2023 09:56:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=l695v3k22SLQ9MA4+7pIYQDdQUW1Ob+43taVnj0Yu7g=; b=dSv7YB3jBtLYZN NrrKV7Yk715SL9Lgjk3U70OHvmcS2tY/VzDbpRbTIGgJvhd9Y7iBdTC1zfBBmEstMFZmGkPJF6vr2 IpcYC2ZvJowDQOJG6/6QVF+dqM1Ww4kid4Y9vQcTCewWXUGC3XAVZfPbJvgo9JpPFyTEXlaLsaW51 B7YzPG8dn3d2EmZYmt1ca9P9ll+Hl3GAr2ryVsBj8NASfDO1+XFlsZfTv9r23E15GR+1d8DZTAncZ wsbUs/JgM3y40Y66LWK0krM9EL83LGWBlSy8SEhruYkTr8qV+51lxLNjlO0rN7qqZmKzcaLFFnq8S VBFq+K3d4TPMxt4I1bnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q3w56-00DGsn-0X; Tue, 30 May 2023 09:55:56 +0000 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q3w53-00DGrD-0B for linux-arm-kernel@lists.infradead.org; Tue, 30 May 2023 09:55:54 +0000 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-4f4b0a0b557so4577024e87.1 for ; Tue, 30 May 2023 02:55:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685440548; x=1688032548; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=fV0A9lh1lqDIlbdillmGoiC07mhiQejFpkRc8wrmkBo=; b=X1jGllTD0rXkJr8JvHV5/Wa7WZbZl8pQ2KKM/ClxFhWq5Wdi8vv/pI8WxMwIZBVaCl knL9wVpmeGls3FR9tjZizHWswdcQ6vyMjTLjhjZMUHGEfi8tvznbiPOBFUjEPqVQhMlV Aqo1Sd3lAlwSFz/Fghan0mAZlKc9bfP5xpbDO9ZJaRVtvo+EavvNmzQf7797HyHA7C+q wS2WQmYogIbJws6dI26ZXx9V6CA0lN3mbNQBw5fzmunUGB7H3LqIkl+88zyqhVL+N9EY 0fAhDj0zRMm1GBXmlWc/TlxLSDq/MsRkrEmDcHmgdtL0dHbLv10t/OXtalqd3cAS9uMR CKwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685440548; x=1688032548; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fV0A9lh1lqDIlbdillmGoiC07mhiQejFpkRc8wrmkBo=; b=XYJlqt0WZV7TfD79zv11JofWijRtCujeSF/L6//JhvaRvs/7iBBm1WfqK+caIumHQH pftR3NhC082juJav1ZFsjrqlHZIsDRmstISsSbwIz0IvzVJCZic6hwHpn6yLOJKbJLs9 d6iTHZTLqv5Zu2HoiwS482IlCKwtc+/AJcLO4pnbqxstAPTZeGGSSb9Go/0lyPr0Ikc2 lFTSVLsVBRanU11xSxJkGEYG6HmPrz6bIrJVYyymBj/8jiKU9InOfg1s68182Dq2WvoU SIYSThwvi2zayjz7PaCNBGAstekAAj3MRmXYa+aA7LkdlZKU51kqpKpu28qBMZB6Fi8o oFEw== X-Gm-Message-State: AC+VfDxlorMk8XCaEajPd56DDJ3gek1FqbjPYg1EIpF3Ohtvl7A0EP+2 q4cyR6/CoBVVIetF0k4oMVmKbg== X-Google-Smtp-Source: ACHHUZ740qedWBuyEGK8mzdvZtJt6JQ5S/1PcHOCvgFR5t2BGLsVlByelp1mqEzCOksVeqG2W2EfFQ== X-Received: by 2002:a05:6512:21aa:b0:4f3:8223:eb81 with SMTP id c10-20020a05651221aa00b004f38223eb81mr487631lft.6.1685440548632; Tue, 30 May 2023 02:55:48 -0700 (PDT) Received: from uffe-tuxpro14.. (h-94-254-63-18.NA.cust.bahnhof.se. [94.254.63.18]) by smtp.gmail.com with ESMTPSA id b3-20020ac25e83000000b004f377f317d4sm282857lfq.285.2023.05.30.02.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 02:55:48 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Kevin Hilman , Ulf Hansson , Dan Carpenter , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] PM: domains: Move the verification of in-params from genpd_add_device() Date: Tue, 30 May 2023 11:55:36 +0200 Message-Id: <20230530095536.61907-1-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230530_025553_117777_B4B093C1 X-CRM114-Status: GOOD ( 12.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The commit f38d1a6d0025 ("PM: domains: Allocate governor data dynamically based on a genpd governor") started to use the in-parameters in genpd_add_device(), without first doing a verification of them. This isn't really a big problem, as most callers do a verification already. Therefore, let's drop the verification from genpd_add_device() and make sure all the callers take care of it instead. Reported-by: Dan Carpenter Fixes: f38d1a6d0025 ("PM: domains: Allocate governor data dynamically based on a genpd governor") Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 51b9d4eaab5e..5cb2023581d4 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1632,9 +1632,6 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, dev_dbg(dev, "%s()\n", __func__); - if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) - return -EINVAL; - gpd_data = genpd_alloc_dev_data(dev, gd); if (IS_ERR(gpd_data)) return PTR_ERR(gpd_data); @@ -1676,6 +1673,9 @@ int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) { int ret; + if (!genpd || !dev) + return -EINVAL; + mutex_lock(&gpd_list_lock); ret = genpd_add_device(genpd, dev, dev); mutex_unlock(&gpd_list_lock); @@ -2523,6 +2523,9 @@ int of_genpd_add_device(struct of_phandle_args *genpdspec, struct device *dev) struct generic_pm_domain *genpd; int ret; + if (!dev) + return -EINVAL; + mutex_lock(&gpd_list_lock); genpd = genpd_get_from_provider(genpdspec);