From patchwork Wed Jan 18 08:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 643961 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 97696C004D4 for ; Wed, 18 Jan 2023 09:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229436AbjARJVP (ORCPT ); Wed, 18 Jan 2023 04:21:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230284AbjARJUl (ORCPT ); Wed, 18 Jan 2023 04:20:41 -0500 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85A3975A1D for ; Wed, 18 Jan 2023 00:38:35 -0800 (PST) Received: by mail-pl1-x635.google.com with SMTP id d9so36165789pll.9 for ; Wed, 18 Jan 2023 00:38:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rk4Yuj9GI6UIE2hgNfLDbnDh1l8wksnTp158bl3zXSc=; b=nnVisWFzyIwOrVLjxPSve3qNP6rlOovgA08f/iPGaiQzYCJDpfc9cgeCKtC9MHW+kK ZvW4Sc2nntdflPaYnuFaYre3Sr/kiKblRrhJrUBzpbcTDzugbaRDddIcCPhAgDHsI4/f hKCu8uLh5cFo7Yacgt4UNDEi09FMXoq3UDlpNEqhVxwwG7wmtqynXrXBknEEn3OmGNdf /RcVCJWhb8a4Z708WmmoxrSr0rLAqYbyBQ++KoBoX3PLTxPDZX/ATNB+eDk9d6RI+xOt 7ITaEYKwnx3xHuTvLjZS+5/3we3/mCg5wMhqy6jMzkeSk0VENs10bG48V+oySz5I4par 9bYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rk4Yuj9GI6UIE2hgNfLDbnDh1l8wksnTp158bl3zXSc=; b=tIAbA538ioCl0KaRuNHmLYg00X7FWdaUiv+MrtYJrGQM61uayjuKFtOtypQB1dardv JJgzsHiS2qP8XCN5xVBdNbmXCcKsJB4qujE7DxPx9aik0TI38rgpCYKM21Y2vEVMuQu2 0XPdOCMxpH3AH+Lz9FuGclYeywpitJCL4EVRubuznMk5Ru7TTJvsF8LxE6+qhESHHysT pZddcvCazBzk6KqgUG+pzbhkZqxAJpA8tmQijmCgmqMnmGBPdlwUfPKSBO7JiGZbtKz/ jlf1P8Xsy7ROpQ02FjIJpjJMY7NjE37iR6gPYFjxPD3xbwARZs/kseMWiD21fLWiWYHN z/dg== X-Gm-Message-State: AFqh2kpjsPmxWvHf7zGBopcrNeG2uQUvXcjyvc4LCCCsusZk+y8k4d1g 4DxSQ0VxTyx6L+PhBg//zMpmbDhAz9eNoVLj X-Google-Smtp-Source: AMrXdXsFjoz00AgH9TIWqwkZuGatKxLiS7uOo9FgY+fRilu9KfZYXmhBSNT9y0HW0aYsx03+Ir8NXg== X-Received: by 2002:a17:902:d512:b0:192:fd1e:a968 with SMTP id b18-20020a170902d51200b00192fd1ea968mr9510211plg.46.1674031114966; Wed, 18 Jan 2023 00:38:34 -0800 (PST) Received: from localhost ([122.172.81.45]) by smtp.gmail.com with ESMTPSA id y13-20020a17090322cd00b001896af10ca7sm350395plg.134.2023.01.18.00.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 00:38:34 -0800 (PST) From: Viresh Kumar To: "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Yang Yingliang , Viresh Kumar Cc: linux-pm@vger.kernel.org, Vincent Guittot , Caleb Connolly , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH V4 1/3] thermal: core: call put_device() only after device_register() fails Date: Wed, 18 Jan 2023 14:08:24 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org put_device() shouldn't be called before a prior call to device_register(). __thermal_cooling_device_register() doesn't follow that properly and needs fixing. Also thermal_cooling_device_destroy_sysfs() is getting called unnecessarily on few error paths. Fix all this by placing the calls at the right place. Based on initial work done by Caleb Connolly. Fixes: 4748f9687caa ("thermal: core: fix some possible name leaks in error paths") Fixes: c408b3d1d9bb ("thermal: Validate new state in cur_state_store()") Reported-by: Caleb Connolly Signed-off-by: Viresh Kumar Tested-by: Frank Rowand Reviewed-by: Yang Yingliang Tested-by: Caleb Connolly --- For v6.2-rc. V3->V4: - The first three versions were sent by Caleb. - The new version fixes the current bugs, without looking to optimize the code any further, which is done separately in the next two patches. drivers/thermal/thermal_core.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index f17ab2316dbd..77bd47d976a2 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -909,15 +909,20 @@ __thermal_cooling_device_register(struct device_node *np, cdev->devdata = devdata; ret = cdev->ops->get_max_state(cdev, &cdev->max_state); - if (ret) - goto out_kfree_type; + if (ret) { + kfree(cdev->type); + goto out_ida_remove; + } thermal_cooling_device_setup_sysfs(cdev); + ret = dev_set_name(&cdev->device, "cooling_device%d", cdev->id); if (ret) { + kfree(cdev->type); thermal_cooling_device_destroy_sysfs(cdev); - goto out_kfree_type; + goto out_ida_remove; } + ret = device_register(&cdev->device); if (ret) goto out_kfree_type; @@ -943,6 +948,8 @@ __thermal_cooling_device_register(struct device_node *np, thermal_cooling_device_destroy_sysfs(cdev); kfree(cdev->type); put_device(&cdev->device); + + /* thermal_release() takes care of the rest */ cdev = NULL; out_ida_remove: ida_free(&thermal_cdev_ida, id); From patchwork Wed Jan 18 08:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 645355 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13386C004D4 for ; Wed, 18 Jan 2023 09:21:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229936AbjARJVJ (ORCPT ); Wed, 18 Jan 2023 04:21:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230285AbjARJUl (ORCPT ); Wed, 18 Jan 2023 04:20:41 -0500 Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C56F975730 for ; Wed, 18 Jan 2023 00:38:38 -0800 (PST) Received: by mail-pg1-x52c.google.com with SMTP id v3so23973378pgh.4 for ; Wed, 18 Jan 2023 00:38:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=id0JR6OCkU6vLjgrNgRIuw5EcxaUhOjb9e6uHVbO4ng=; b=w6Obwzd3CGGBvdmAWvcE8LFRen+uO0H92gJZLVS6ZqKIa06i2L4mg/83y+oTpIP9sV woX+pSIKfzgtRr2jj2eDz/bTS6yVX1HxRVvVnfbUZHHpoTxmTAWoucMRg7h9SuIg/hv8 An2ZMUJ7HC0Ha1SHW1/tKC5nwI1BEVfDNNfQU1mK+JYQIUp1Xv8I9dFuKgYjOvxN06Jq w9tWMN3Uzd8Eq0aW6Iq854BYR12pMSDZgAO28gFPgZrdI+XwetDFnLDVlfel6We/UR1S NiUPPa0YHthXx5UlaPzu5CnlXhBM/P8RK3Zdse6gB0ltxlvZdxvMfavGxDhX3/K0vvjj +Rcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=id0JR6OCkU6vLjgrNgRIuw5EcxaUhOjb9e6uHVbO4ng=; b=yEVPHf/DafK+14X3gLb9ixWqc4GxQHxq2mxowwc7Lt7GXIkp3o8ehT0IsSbBoE2PED 9DPis0kZorvwfSB/xToP8YetIZ6hAQmfMTKCSvEZSIhFKlSqfpPQW/alrd76mzWNUoGK P47KMSZYNcVMwc30IUvmKlXYD/5k1t3GcRF/o8PnwfVmpqmKPwd1+DiQ+1qsPfMNHq5e HH99ZXiwBNLHGJsQAzddcVmye7LLEQTtymSlMMqPO4NQiFJiFSRX2vV6PdtHqKtwYea0 iKFK1k/SRWlsoINGkrYF7EU51L6l4YgAtJ5zeE8sGJ1bO9zh4pja0vzgschACNfesCCO T5lg== X-Gm-Message-State: AFqh2ko1MVfOAmsoiOiYgItuAuH0Hpu+BXjo+/rhgF7l+JTbTfar5wyU lEbgd8xYQa1UuZgTeAeH4tHuUg== X-Google-Smtp-Source: AMrXdXsaR0p9XFpJdxoiAqHT2u53w+g7DgHhCblPR0lWQS5kewzQSvMuA5WNmvvwWNF6y845T0pSlg== X-Received: by 2002:a05:6a00:26cc:b0:589:62bd:14d with SMTP id p12-20020a056a0026cc00b0058962bd014dmr5988623pfw.1.1674031118270; Wed, 18 Jan 2023 00:38:38 -0800 (PST) Received: from localhost ([122.172.81.45]) by smtp.gmail.com with ESMTPSA id i70-20020a628749000000b005815837164fsm6044666pfe.59.2023.01.18.00.38.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 00:38:37 -0800 (PST) From: Viresh Kumar To: "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Caleb Connolly , Yang Yingliang , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] thermal: core: Move cdev cleanup to thermal_release() Date: Wed, 18 Jan 2023 14:08:25 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org thermal_release() already frees cdev, let it do rest of the cleanup as well in order to simplify the error paths in __thermal_cooling_device_register(). Signed-off-by: Viresh Kumar --- drivers/thermal/thermal_core.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 77bd47d976a2..1fb109a97ff6 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -774,6 +774,9 @@ static void thermal_release(struct device *dev) } else if (!strncmp(dev_name(dev), "cooling_device", sizeof("cooling_device") - 1)) { cdev = to_cooling_device(dev); + thermal_cooling_device_destroy_sysfs(cdev); + kfree(cdev->type); + ida_free(&thermal_cdev_ida, cdev->id); kfree(cdev); } } @@ -909,23 +912,21 @@ __thermal_cooling_device_register(struct device_node *np, cdev->devdata = devdata; ret = cdev->ops->get_max_state(cdev, &cdev->max_state); - if (ret) { - kfree(cdev->type); - goto out_ida_remove; - } + if (ret) + goto out_cdev_type; thermal_cooling_device_setup_sysfs(cdev); ret = dev_set_name(&cdev->device, "cooling_device%d", cdev->id); - if (ret) { - kfree(cdev->type); - thermal_cooling_device_destroy_sysfs(cdev); - goto out_ida_remove; - } + if (ret) + goto out_cooling_dev; ret = device_register(&cdev->device); - if (ret) - goto out_kfree_type; + if (ret) { + /* thermal_release() handles rest of the cleanup */ + put_device(&cdev->device); + return ERR_PTR(ret); + } /* Add 'this' new cdev to the global cdev list */ mutex_lock(&thermal_list_lock); @@ -944,13 +945,10 @@ __thermal_cooling_device_register(struct device_node *np, return cdev; -out_kfree_type: +out_cooling_dev: thermal_cooling_device_destroy_sysfs(cdev); +out_cdev_type: kfree(cdev->type); - put_device(&cdev->device); - - /* thermal_release() takes care of the rest */ - cdev = NULL; out_ida_remove: ida_free(&thermal_cdev_ida, id); out_kfree_cdev: @@ -1111,10 +1109,7 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) mutex_unlock(&thermal_list_lock); - ida_free(&thermal_cdev_ida, cdev->id); device_del(&cdev->device); - thermal_cooling_device_destroy_sysfs(cdev); - kfree(cdev->type); put_device(&cdev->device); } EXPORT_SYMBOL_GPL(thermal_cooling_device_unregister); From patchwork Wed Jan 18 08:38:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 645353 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 850F3C004D4 for ; Wed, 18 Jan 2023 09:23:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229603AbjARJXL (ORCPT ); Wed, 18 Jan 2023 04:23:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230293AbjARJUm (ORCPT ); Wed, 18 Jan 2023 04:20:42 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD3FD75A36 for ; Wed, 18 Jan 2023 00:38:41 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id k13so3607741plg.0 for ; Wed, 18 Jan 2023 00:38:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F8AmeTIEVUx58Wbd0penu0pGx5Sd8zIQKSjU9tMK1s0=; b=fcxxGLXsEhMz1dXR+sW8vGv8hQhFw2nTQq3bG8GW3oPm2WHJOcpNSJCfv6N/Pd5EfF gQ7D6TVNnPHDZy2ZAFJBUkDYUA4OV3g2boYlEUnb7XmEpc4oLQb8+I2u3tCJwcyxdskl LFYSh8C9+77hbu/5JRCd78RbnRRkWNWLsYefs5nv4hvgIEW/BDKra5AhbQjCuaG4aFLe NusRmWiND9VbcJsssJtE/p6ieuXjGVCNEyZNFuZzGcGYFZLKZgD9INuvtCeK3M0ZBQRQ zL2nx0F2yUhh5Ek4w13rYMU2yBKI3aoK/d2v/f9wvCsYlhZw/iWHpkiyYuzXbrZrNVYS n6Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F8AmeTIEVUx58Wbd0penu0pGx5Sd8zIQKSjU9tMK1s0=; b=A57znhH6q8ULLiBpPzasKHiV8FlTQrVfzw7ATDd3nGwLgNGq2Kyt8MFq3zQCn2AN3G Jp1IMHE0yQLUOzSnWWLAZPMCd5FS0V00MYj++FnWBNuKJ57Br2vLPFxqIaOxnye8QVGQ UgVgbAf27Fb0Wn9P8Z9NSP40c3ottqvDaVpbMS4zgBJIgMHjOsD3bU2cWPIrEyf/pYn6 iy8fCuvIEPQUuzyQuAcczx6SCOE/qDge+tc2oVUQ6gGXVOcdXwGVMRBcZZIdlErE9rvT 61TfcXbJGAReG4QQ6HtH0T9ED+KXKYUvauAguQwsK8VrwFzn7+0MyrIadwFYDX3Kkii2 FurQ== X-Gm-Message-State: AFqh2krsdTlrdx8yArLje/cwOUVauncKMkPQgKq3JT/1mJ0wsHrLxv7g pIaT+qFxvJYZIDxFfD2BR2fz6w== X-Google-Smtp-Source: AMrXdXtPjHYpN5DQbvFwLPlpgG7s1EXXuufzxx093G1OB5KnHQTwUfhTgapAMC1qsnVH4q63TuGbfQ== X-Received: by 2002:a05:6a20:ba90:b0:a6:7529:7c99 with SMTP id fb16-20020a056a20ba9000b000a675297c99mr6357612pzb.5.1674031121455; Wed, 18 Jan 2023 00:38:41 -0800 (PST) Received: from localhost ([122.172.81.45]) by smtp.gmail.com with ESMTPSA id a20-20020aa794b4000000b0058bb0b8750csm9713730pfl.88.2023.01.18.00.38.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 00:38:40 -0800 (PST) From: Viresh Kumar To: "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Caleb Connolly , Yang Yingliang , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] thermal: core: Use device_unregister() instead of device_del/put() Date: Wed, 18 Jan 2023 14:08:26 +0530 Message-Id: X-Mailer: git-send-email 2.31.1.272.g89b43f80a514 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Lets not open code device_unregister() unnecessarily. Signed-off-by: Viresh Kumar --- drivers/thermal/thermal_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 1fb109a97ff6..9fb37c5d9c4f 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1109,8 +1109,7 @@ void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev) mutex_unlock(&thermal_list_lock); - device_del(&cdev->device); - put_device(&cdev->device); + device_unregister(&cdev->device); } EXPORT_SYMBOL_GPL(thermal_cooling_device_unregister);