Skip to contentSkip to conversation

powercap: restrict energy meter to root access

PATCH In review Donghai Qiao 5 participants 5 messages Nov 10, 2020 – Dec 2, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 powercap: restrict energy meter to root access

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844297
Upstream status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=949dd0104c496fa7c14991a23c03c62e44637e71
Build info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=32573686
CVE: CVE-2020-8694

author Len Brown <[email protected]> 2020-11-10 13:00:00 -0800
committer Len Brown <[email protected]> 2020-11-10 11:40:57 -0500
commit 949dd0104c496fa7c14991a23c03c62e44637e71 (patch)
tree a90cbfb8ceb195e7160105a272122f97bab99980
parent 3d7772ea5602b88c7c7f0a50d512171a2eed6659 (diff)
download linux-949dd0104c496fa7c14991a23c03c62e44637e71.tar.gz
powercap: restrict energy meter to root access Remove non-privileged user access to power data contained in /sys/class/powercap/intel-rapl*/*/energy_uj

Non-privileged users currently have read access to power data and can use this data to form a security attack. Some privileged drivers/applications need read access to this data, but don't expose it to non-privileged users.

For example, thermald uses this data to ensure that power management works correctly. Thus removing non-privileged access is preferred over completely disabling this power reporting capability with CONFIG_INTEL_RAPL=n.

Fixes 95677a9a3847 ("PowerCap: Fix mode for energy counter")
---
 drivers/powercap/powercap_sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/powercap/powercap_sys.c +2 -2
index e85639f004cc..e2150c00b842 100644
@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
 					&dev_attr_max_energy_range_uj.attr;
 	if (power_zone->ops->get_energy_uj) {
 		if (power_zone->ops->reset_energy_uj)
-			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
 		else
-			dev_attr_energy_uj.attr.mode = S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IRUSR;
 		power_zone->zone_dev_attrs[count++] =
 					&dev_attr_energy_uj.attr;
 	}
Signature · 1 line
2.18.1
#1 lore raw

Hi,

This is a friendly email about rhcheckpatch. Please consult the data below for more info.

SUMMARY: This patch series has 1 ERRORS and 0 WARNINGS.
Subject: [RHEL8.4 BZ1844297 CVE-2020-8694 v5] powercap: restrict energy meter to root access
E Commit: no valid id found! (if not upstream, add RHEL-only and explain why)

1 patch(es) checked, ERRORS: 1, WARNINGS: 0

--
# Generated by 'rhcheckpatch.py'
# For source: https://gitlab.cee.redhat.com/cki-project/rhel-tools
# For documentation read
# https://gitlab.cee.redhat.com/cki-project/rhel-tools/blob/main/README.md

maintainer
#2 lore raw
Quoted 9 lines · On Tue, Nov 10, 2020 at 04:14:31PM -0500, [email protected] wrote:

Hi,

This is a friendly email about rhcheckpatch. Please consult the data below for more info.

SUMMARY: This patch series has 1 ERRORS and 0 WARNINGS.
Subject: [RHEL8.4 BZ1844297 CVE-2020-8694 v5] powercap: restrict energy meter to root access
E Commit: no valid id found! (if not upstream, add RHEL-only and explain why)

Quoted 8 lines

1 patch(es) checked, ERRORS: 1, WARNINGS: 0

--
# Generated by 'rhcheckpatch.py'
# For source: https://gitlab.cee.redhat.com/cki-project/rhel-tools
# For documentation read
# https://gitlab.cee.redhat.com/cki-project/rhel-tools/blob/main/README.md

Any reason you are sending internal Red Hat emails to a public mailing list? You all might want to add a filter somewhere...

thanks,

greg k-h

Acked-by on v5 1/1
#3 lore raw
In reply to Donghai Qiao
Quoted 41 lines · Donghai Qiao

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844297
Upstream status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=949dd0104c496fa7c14991a23c03c62e44637e71
Build info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=32573686
CVE: CVE-2020-8694

author Len Brown <[email protected]> 2020-11-10 13:00:00 -0800
committer Len Brown <[email protected]> 2020-11-10 11:40:57 -0500
commit 949dd0104c496fa7c14991a23c03c62e44637e71 (patch)
tree a90cbfb8ceb195e7160105a272122f97bab99980
parent 3d7772ea5602b88c7c7f0a50d512171a2eed6659 (diff)
download linux-949dd0104c496fa7c14991a23c03c62e44637e71.tar.gz
powercap: restrict energy meter to root access Remove non-privileged user access to power data contained in /sys/class/powercap/intel-rapl*/*/energy_uj

Non-privileged users currently have read access to power data and can use this data to form a security attack. Some privileged drivers/applications need read access to this data, but don't expose it to non-privileged users.

For example, thermald uses this data to ensure that power management works correctly. Thus removing non-privileged access is preferred over completely disabling this power reporting capability with CONFIG_INTEL_RAPL=n.

Fixes 95677a9a3847 ("PowerCap: Fix mode for energy counter")
---
  drivers/powercap/powercap_sys.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/powercap/powercap_sys.c +0 -0
index e85639f004cc..e2150c00b842 100644
@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
  					&dev_attr_max_energy_range_uj.attr;

drivers/powercap/powercap_sys.c static void create_power_zone_common_attributes( · line 387

Quoted 10 lines
drivers/powercap/powercap_sys.c +2 -2
  	if (power_zone->ops->get_energy_uj) {
  		if (power_zone->ops->reset_energy_uj)
-			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
  		else
-			dev_attr_energy_uj.attr.mode = S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IRUSR;
  		power_zone->zone_dev_attrs[count++] =
  					&dev_attr_energy_uj.attr;
  	}
Acked-by on v5 1/1
#4 lore raw
In reply to Donghai Qiao
Quoted 54 lines · Donghai Qiao

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1844297
Upstream status: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=949dd0104c496fa7c14991a23c03c62e44637e71
Build info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=32573686
CVE: CVE-2020-8694

author Len Brown <[email protected]> 2020-11-10 13:00:00 -0800
committer Len Brown <[email protected]> 2020-11-10 11:40:57 -0500
commit 949dd0104c496fa7c14991a23c03c62e44637e71 (patch)
tree a90cbfb8ceb195e7160105a272122f97bab99980
parent 3d7772ea5602b88c7c7f0a50d512171a2eed6659 (diff)
download linux-949dd0104c496fa7c14991a23c03c62e44637e71.tar.gz
powercap: restrict energy meter to root access Remove non-privileged user access to power data contained in /sys/class/powercap/intel-rapl*/*/energy_uj

Non-privileged users currently have read access to power data and can use this data to form a security attack. Some privileged drivers/applications need read access to this data, but don't expose it to non-privileged users.

For example, thermald uses this data to ensure that power management works correctly. Thus removing non-privileged access is preferred over completely disabling this power reporting capability with CONFIG_INTEL_RAPL=n.

Fixes 95677a9a3847 ("PowerCap: Fix mode for energy counter")
---
 drivers/powercap/powercap_sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/powercap/powercap_sys.c +2 -2
index e85639f004cc..e2150c00b842 100644
@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
 					&dev_attr_max_energy_range_uj.attr;
 	if (power_zone->ops->get_energy_uj) {
 		if (power_zone->ops->reset_energy_uj)
-			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
 		else
-			dev_attr_energy_uj.attr.mode = S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IRUSR;
 		power_zone->zone_dev_attrs[count++] =
 					&dev_attr_energy_uj.attr;
 	}
Signature · 1 line
2.18.1