Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp630934pxu; Fri, 4 Dec 2020 11:25:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxlIjhbdG/kWuC7bDv/YW38KEKhKHBDdj/AQc1JGF0DjlYOIGzBZA9ihb6q0v4LEgA/QFAO X-Received: by 2002:a17:906:c244:: with SMTP id bl4mr8195080ejb.430.1607109905076; Fri, 04 Dec 2020 11:25:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607109905; cv=none; d=google.com; s=arc-20160816; b=EWprSst/rBFpTDKplQWlWJvLm2ZBdCCSD2aP/7JqbUXCabDuQ0ZwoBpxQ+IVgqjcS4 9bdgZF1FW90qFeR1QwtbzMObnXtLhx2GY03TelH28lEORbyK4cKoG9UKLOfb8DKbywnM AOO/X0P4EvDxGDSu4yTpwtE83ZmlVYJjCZv9TpV8O3WMjgY8S6aHFshbfJC18N5i40tC 2zU9GG6gMH3naynH7efrlnAu+HHp7Hpp68soeuNyfmizE/MNt66T2bufcXl2fH+4NMmf 2jwKm38zGwhs8nVo0kVMkdKQYjJQETezcYbqfbTutVmJp5phjxmnb06SUTbpsoZDoeFh 2a6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:from:references :cc:to:subject:dkim-signature; bh=3/Vcyqx/bnH5HvtWm7DxX6AP78VpEtIwur5saeHrMps=; b=jWimkjfckgav3+ntFINtrTjrLB9aS4HKRv/smfoxaXG7tLQzlfUBX+UPzGGDwhp9yq lEqUEWs3ljIZR/f8ISaKjfABRN8rKQp8z8JHS41MBdFEbxukKIYKcKvY7RBXbMpx3mu9 wQ0pWWrFVet2S0xPTGWH3sgKVsQDleglsWriWg55Vy1gi1Cvf6NJHK+axeRyzkPNPTUV jeQONwTeme6G9uKH8PIHOa04h/ga7j96TUdU+M8YNDPWhG2wOKcDpQ9ORgz/Mc1SsEk5 tlAGERvsPgHpZW+0pKOZHpRwLIMjfIlN5H4E3+/po1KBXJmRokkSgd7m96KgNfXjOvFq EJAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TUOxVnxv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hr22si1809648ejc.411.2020.12.04.11.24.41; Fri, 04 Dec 2020 11:25:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TUOxVnxv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730406AbgLDTVq (ORCPT + 99 others); Fri, 4 Dec 2020 14:21:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726392AbgLDTVq (ORCPT ); Fri, 4 Dec 2020 14:21:46 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85E4EC061A51 for ; Fri, 4 Dec 2020 11:21:05 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id z7so6389254wrn.3 for ; Fri, 04 Dec 2020 11:21:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=3/Vcyqx/bnH5HvtWm7DxX6AP78VpEtIwur5saeHrMps=; b=TUOxVnxvXyCzCDNaCP/1OANO8jIe42W+4q7q2qx8Ps0PlTe/24v+H7yFqJCU2gjkly yKBoRXY4aK4pkL6YLXvLYYLZaAeWBYVxzIAomHRQlNhtPJUy3ZZJ5gNITiE3mFl9NwZd O60zEppYkoS7pItZJvY+EeEo5vXaCLAYAyg17cK+JS0A3Z9K8RkyB596xqkDsnM07ITa xG7mJ4bT9E2T5FCFvDFWSCIYeqJARgWN0EKd5adBG4I4BcjmXCSNo7F4Qmsq8MVHxTQ/ C7MRTVSUrhDCM9wobCamGUfjbA4kp3iqkKsEsXuYBcMBe0BH1tE+YnE9YzUHXZzQVHIP HVVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=3/Vcyqx/bnH5HvtWm7DxX6AP78VpEtIwur5saeHrMps=; b=QlOhvFV3J/75gz3nOmkerXoxkEiSv2Zxn+hlLYdXO19fDHHlr2UQSZfguUD8gfpEed 8zwCY+ScXqJiPD0FJQdCUcVl2fUChDS4sPM+gFSbfb7sbOl0AH0qcjB+VC99SSW5CWK2 DKyJnrQTBHV6ycUjHhPz1T1bHNuMG4rp8Lzxh9sEgcbiYiULTbvDpDJZZoPnPLbT6I3B PMRRG9Q62z0hbGHTEAnM9+w0MOnBX3yjmiKjcPCIM3GICUedQiY3bCyY4J5dJ6Xss0hr hP4gd6Ns/vjZr2ymDX+w6MFd3t8bZlus5Dzz+8OY+cXNPS0vgynjo7EU+Zt/Xx9doPgx WWaQ== X-Gm-Message-State: AOAM530nOUDID4KLGFpASNVShju6vte0SKvATlnIVBw0SKF51I96MT0I C4UMELvIHdNG42WEGHlu7MbiW6vUTiIW5g== X-Received: by 2002:adf:e449:: with SMTP id t9mr6493626wrm.257.1607109663627; Fri, 04 Dec 2020 11:21:03 -0800 (PST) Received: from ?IPv6:2a01:e34:ed2f:f020:8165:c1cc:d736:b53f? ([2a01:e34:ed2f:f020:8165:c1cc:d736:b53f]) by smtp.googlemail.com with ESMTPSA id s8sm4502818wrn.33.2020.12.04.11.21.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Dec 2020 11:21:02 -0800 (PST) Subject: Re: [PATCH] drivers: thermal: Add NULL pointer check before using cooling device stats To: Manaf Meethalavalappu Pallikunhi , Zhang Rui , Eduardo Valentin , Amit Kucheria , Ram Chandrasekar Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org References: <1607108991-31948-1-git-send-email-manafm@codeaurora.org> From: Daniel Lezcano Message-ID: <726f7a97-e663-64ff-d2bc-aaa23aaa85ec@linaro.org> Date: Fri, 4 Dec 2020 20:21:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <1607108991-31948-1-git-send-email-manafm@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/12/2020 20:09, Manaf Meethalavalappu Pallikunhi wrote: > There is a possible chance that some cooling device stats buffer > allocation fails due to very high cooling device max state value. > Later cooling device update or cooling stats sysfs will try to > access stats data for the same cooling device. It will lead to > NULL pointer dereference issue. > > Add a NULL pointer check before accessing thermal cooling device > stats data. It fixes the following bug Why not create the 'stats' dir if the setup fails ? > [ 26.812833] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000004 > [ 27.122960] Call trace: > [ 27.122963] do_raw_spin_lock+0x18/0xe8 > [ 27.122966] _raw_spin_lock+0x24/0x30 > [ 27.128157] thermal_cooling_device_stats_update+0x24/0x98 > [ 27.128162] cur_state_store+0x88/0xb8 > [ 27.128166] dev_attr_store+0x40/0x58 > [ 27.128169] sysfs_kf_write+0x50/0x68 > [ 27.133358] kernfs_fop_write+0x12c/0x1c8 > [ 27.133362] __vfs_write+0x54/0x160 > [ 27.152297] vfs_write+0xcc/0x188 > [ 27.157132] ksys_write+0x78/0x108 > [ 27.162050] ksys_write+0xf8/0x108 > [ 27.166968] __arm_smccc_hvc+0x158/0x4b0 > [ 27.166973] __arm_smccc_hvc+0x9c/0x4b0 > [ 27.186005] el0_svc+0x8/0xc > > Signed-off-by: Manaf Meethalavalappu Pallikunhi > --- > drivers/thermal/thermal_sysfs.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c > index 473449b..a5e4855 100644 > --- a/drivers/thermal/thermal_sysfs.c > +++ b/drivers/thermal/thermal_sysfs.c > @@ -827,6 +827,9 @@ void thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev, > { > struct cooling_dev_stats *stats = cdev->stats; > > + if (!stats) > + return; > + > spin_lock(&stats->lock); > > if (stats->state == new_state) > @@ -848,6 +851,9 @@ static ssize_t total_trans_show(struct device *dev, > struct cooling_dev_stats *stats = cdev->stats; > int ret; > > + if (!stats) > + return -ENODEV; > + > spin_lock(&stats->lock); > ret = sprintf(buf, "%u\n", stats->total_trans); > spin_unlock(&stats->lock); > @@ -864,6 +870,9 @@ time_in_state_ms_show(struct device *dev, struct device_attribute *attr, > ssize_t len = 0; > int i; > > + if (!stats) > + return -ENODEV; > + > spin_lock(&stats->lock); > update_time_in_state(stats); > > @@ -882,8 +891,12 @@ reset_store(struct device *dev, struct device_attribute *attr, const char *buf, > { > struct thermal_cooling_device *cdev = to_cooling_device(dev); > struct cooling_dev_stats *stats = cdev->stats; > - int i, states = stats->max_states; > + int i, states; > + > + if (!stats) > + return -ENODEV; > > + states = stats->max_states; > spin_lock(&stats->lock); > > stats->total_trans = 0; > @@ -907,6 +920,9 @@ static ssize_t trans_table_show(struct device *dev, > ssize_t len = 0; > int i, j; > > + if (!stats) > + return -ENODEV; > + > len += snprintf(buf + len, PAGE_SIZE - len, " From : To\n"); > len += snprintf(buf + len, PAGE_SIZE - len, " : "); > for (i = 0; i < stats->max_states; i++) { > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog