Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp6011174ybc; Wed, 27 Nov 2019 13:21:27 -0800 (PST) X-Google-Smtp-Source: APXvYqwY/AW0npYHTe69zJZche3b6aaEBCp8vLQrW3tdmDmojbaqwU978uG3LZtj7UuR0cWjNdnf X-Received: by 2002:a17:906:70d6:: with SMTP id g22mr50444589ejk.221.1574889687213; Wed, 27 Nov 2019 13:21:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574889687; cv=none; d=google.com; s=arc-20160816; b=F8tR6TCwVj3IPeLnveh9xz/nmwQG+Z/zQZmxve1O+xvyPwZ0s8OIegeVslcqfi7njB cITBwLAOa/7X7uSQyoEvJCm43l1goZfX2mYHZgyY24F2PybVpq8PDwKrOQE0VsBiO5tH CIJ/K6nckW1Hs3hpGKT2iyS5941NxToQhRge2A3WY1woFsq2QeCbV3Vao8drVQnpyRTw p7ElsAG0r3QDFIITJmbtoXZP8PizgkEU+1FxKOVqmuEdLCKZOtdUuNKcwTqvUcPqOeVC 7sRnEN17BE74KxPEymQ0SeNwKIKt2cVjkWcW6g/e1d8GG1Hs0kLlzvv4Txwqag7ihF0N oKBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RCJ/aB61ofRXcVQg1ODa4E9BohHPXIX22OKyw/hZtvg=; b=00zo+MjI/ih+15CpLwfnxumtp1OLl4ql3FNkVmbqzLAOB1Mmqjf0VmnLEKDgfDykJR dZiBPLPR8Jab7R/nzb2QbGVkKOOOhPafTcdOTgspL3/zlzFzP5IKc8Es+P+fgWnAA3O0 Qcl2suhl5/1GgIEAnCx0H8CaD9vqXOIe8jbwciCwH1ZCknQYuIYseqDUn2/NMbStnwm3 1rVq/+M1phw86ZceaT5ebZEFqNfRf6R2ZI1qy+E+vQmteVQgoeAqwUVNDkj1ficZZXZx MwV/zPkjm+QiY7RdIHm0LdFm9jrVR6GTNJ8m7oPdrAGTJiaDhumshTz6qNGvKu/3CUYI TGmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V5ncSDYf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id np1si10330116ejb.370.2019.11.27.13.21.03; Wed, 27 Nov 2019 13:21:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V5ncSDYf; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728945AbfK0VQo (ORCPT + 99 others); Wed, 27 Nov 2019 16:16:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:46226 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732618AbfK0VNn (ORCPT ); Wed, 27 Nov 2019 16:13:43 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1DB0215F1; Wed, 27 Nov 2019 21:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889223; bh=nHVmU/oIFzQsYfQS/3JhrMAgd1hf4fvK2RzpONW5VZY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V5ncSDYf8Nnlo5o6V1aHiTK/BlmKrrjBmPPekQDLKSAwLjeRCLTD1gvXzzyn4jLw4 At1UVw2lCxTpqtffdi0Ra5miXFWVhN/Me3c2Ahl4PmZaaE+dDzCVccIu+mV2YBxdtt 6JJu4Z0Q6J7rnkEs2+/bSiA8bKYFdFJ6QcyZXHO0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kai Shen , Feilong Lin , Viresh Kumar , "Rafael J. Wysocki" Subject: [PATCH 5.4 35/66] cpufreq: Add NULL checks to show() and store() methods of cpufreq Date: Wed, 27 Nov 2019 21:32:30 +0100 Message-Id: <20191127202713.995299070@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202632.536277063@linuxfoundation.org> References: <20191127202632.536277063@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kai Shen commit e6e8df07268c1f75dd9215536e2ce4587b70f977 upstream. Add NULL checks to show() and store() in cpufreq.c to avoid attempts to invoke a NULL callback. Though some interfaces of cpufreq are set as read-only, users can still get write permission using chmod which can lead to a kernel crash, as follows: chmod +w /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq echo 1 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq This bug was found in linux 4.19. Signed-off-by: Kai Shen Reported-by: Feilong Lin Reviewed-by: Feilong Lin Acked-by: Viresh Kumar [ rjw: Subject & changelog ] Cc: All applicable Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/cpufreq/cpufreq.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -933,6 +933,9 @@ static ssize_t show(struct kobject *kobj struct freq_attr *fattr = to_attr(attr); ssize_t ret; + if (!fattr->show) + return -EIO; + down_read(&policy->rwsem); ret = fattr->show(policy, buf); up_read(&policy->rwsem); @@ -947,6 +950,9 @@ static ssize_t store(struct kobject *kob struct freq_attr *fattr = to_attr(attr); ssize_t ret = -EINVAL; + if (!fattr->store) + return -EIO; + /* * cpus_read_trylock() is used here to work around a circular lock * dependency problem with respect to the cpufreq_register_driver().