Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0B01C43603 for ; Thu, 5 Dec 2019 07:20:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 764A424648 for ; Thu, 5 Dec 2019 07:20:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="R+ykN4UY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726239AbfLEHUP (ORCPT ); Thu, 5 Dec 2019 02:20:15 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:56012 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725974AbfLEHUP (ORCPT ); Thu, 5 Dec 2019 02:20:15 -0500 Received: by mail-pf1-f202.google.com with SMTP id o71so1250968pfg.22 for ; Wed, 04 Dec 2019 23:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:cc; bh=ev64gIbhiiWOfq6m4iAbLRYcJhqCx/lcEwnb1r5g6PE=; b=R+ykN4UYQcA+9UAFBvvgSklElgRJSGCbdjk3VUbcEctURsnU5CwuNXWO88/2LmVMdq r6nn8FUN5jLomBx4p9FG8TEWWtx8HsIrIwaBsiY5fJpb1Nq3Ihrigwf0e+ZNmmAA37An TqtPQrVKW6+ijvL8aWf5sioqroZHaAk1+1kuYyG3n1Md4YCKdf4AXFAnjATz5cha+KMo B/PNQWIKHR7+uvG0qGiYzEsiCZT9Pb38p95lG888xLi8+VbGTuVOVNJ6/YLvBDzz+kUr wLoBayDpo9fpvSJCH9vpLUbLlCUlC0dLETJAYhdav90zY411kNHv5cX88Agdn5JdNPMt Hsug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:cc; bh=ev64gIbhiiWOfq6m4iAbLRYcJhqCx/lcEwnb1r5g6PE=; b=Xg6mTzC0Z7U+F3142newT6tEM4PPRoP005iBj9y4xhebMAlW0/74XVDa3sTLK8oXu4 57RBz0qmn4y365ImngdilsxWmTbGaWbQake7J0B7k7PsW+if/XF+3LSGcjKcu5VI5isW fggBgBA4EemssiMiDAmoS55UAKoFuoxDVfpvp8XSlhNUVRXDaa1XRJVthSrGZeEEG3he n8s+ATsbbO1bUyektNfL7PC2e8MJ8yXhuqc6NXytIjbfAj7bfMoB5Uvn6g/KDme4ra4V mugnUVnW22lPbX46ygXMDzjdtFTKfxz072OkKTY6O/lzj7vwH22MeTtuLT5sLIfMt3K0 gDVA== X-Gm-Message-State: APjAAAWpDBCtZiovS4IsaePTrrXkCzGBevNixAGhRlx9Bso7eqQa6nQk V9tdf8sbXttkokHKlJ5Bmc02lDs= X-Google-Smtp-Source: APXvYqxn9/b8ONASVYeCyp5ipw6UTwiwMuDo9x8iVyDuiezT/48AUdP4cbFPNuPE1WNrZ4V7IFOD8c8= X-Received: by 2002:a65:5a4d:: with SMTP id z13mr7837344pgs.21.1575530414350; Wed, 04 Dec 2019 23:20:14 -0800 (PST) Date: Wed, 4 Dec 2019 23:19:51 -0800 In-Reply-To: <20191205071953.121511-1-wvw@google.com> Message-Id: <20191205071953.121511-2-wvw@google.com> Mime-Version: 1.0 References: <20191205071953.121511-1-wvw@google.com> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog Subject: [PATCH v3 1/3] thermal: prevent cooling device with no type to be registered From: Wei Wang Cc: wei.vince.wang@gmail.com, Wei Wang , Zhang Rui , Eduardo Valentin , Daniel Lezcano , Amit Kucheria , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" To: unlisted-recipients:; (no To-header on input) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org commit 54fa38cc2eda ("thermal: core: prevent zones with no types to be registered") added logic to prevent thermal zone with empty type to be registered. Similarly, there are APIs that rely on cdev->type. This patch prevents cooling device without valid type to be registered. Signed-off-by: Wei Wang --- drivers/thermal/thermal_core.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index d4481cc8958f..974e2d91c30b 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -954,12 +954,22 @@ __thermal_cooling_device_register(struct device_node *np, struct thermal_zone_device *pos = NULL; int result; - if (type && strlen(type) >= THERMAL_NAME_LENGTH) + if (!type || !type[0]) { + pr_err("Error: No cooling device type defined\n"); return ERR_PTR(-EINVAL); + } + + if (strlen(type) >= THERMAL_NAME_LENGTH) { + pr_err("Error: Cooling device name over %d chars: %s\n", + THERMAL_NAME_LENGTH, type); + return ERR_PTR(-EINVAL); + } if (!ops || !ops->get_max_state || !ops->get_cur_state || - !ops->set_cur_state) + !ops->set_cur_state) { + pr_err("Error: Cooling device missing callbacks: %s\n", type); return ERR_PTR(-EINVAL); + } cdev = kzalloc(sizeof(*cdev), GFP_KERNEL); if (!cdev) @@ -972,7 +982,7 @@ __thermal_cooling_device_register(struct device_node *np, } cdev->id = result; - strlcpy(cdev->type, type ? : "", sizeof(cdev->type)); + strlcpy(cdev->type, type, sizeof(cdev->type)); mutex_init(&cdev->lock); INIT_LIST_HEAD(&cdev->thermal_instances); cdev->np = np; -- 2.24.0.393.g34dc348eaf-goog