summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2020-11-24 10:19:46 -0600
committerJory Pratt <anarchy@gentoo.org>2020-11-24 10:20:02 -0600
commit4a13b3d01f226bba74d2a90d73022845849d2bf5 (patch)
tree76e86165a204195a79f6e3ec4ad1ba9f26b40b1c /sys-kernel/zen-sources
parentapp-editors/emacs: Test for existence of movemail. (diff)
downloadgentoo-4a13b3d01f226bba74d2a90d73022845849d2bf5.tar.gz
gentoo-4a13b3d01f226bba74d2a90d73022845849d2bf5.tar.bz2
gentoo-4a13b3d01f226bba74d2a90d73022845849d2bf5.zip
sys-kernel/zen-sources: Version bump 5.9.10
Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Jory Pratt <anarchy@gentoo.org>
Diffstat (limited to 'sys-kernel/zen-sources')
-rw-r--r--sys-kernel/zen-sources/Manifest2
-rw-r--r--sys-kernel/zen-sources/files/CVE-2020-8694.patch45
-rw-r--r--sys-kernel/zen-sources/zen-sources-5.9.10.ebuild (renamed from sys-kernel/zen-sources/zen-sources-5.9.7.ebuild)7
3 files changed, 1 insertions, 53 deletions
diff --git a/sys-kernel/zen-sources/Manifest b/sys-kernel/zen-sources/Manifest
index 920c2a5c353..921367f535c 100644
--- a/sys-kernel/zen-sources/Manifest
+++ b/sys-kernel/zen-sources/Manifest
@@ -1,4 +1,4 @@
DIST genpatches-5.9-1.base.tar.xz 4004 BLAKE2B 8a4577d42262fa901186acc60d28221d00e5c9140886705f018d9989f818d96ee4d9a6586b292e7b1d945bea9e2408e3161a73e0999defe1b7f99d0a339eb7be SHA512 d6ba1051f9561aa30d7b196336c34930285d613e8119b152f1d6cc447cb22db5ac07c25f89d4ceddf58c9370c42699d0250a31449be2da3c591896b0c87d8718
DIST genpatches-5.9-1.extras.tar.xz 1764 BLAKE2B 32d29f0448aef113ba9c9591c5d3b671d00d07abde9f35f365b48168887913bb2da95a8a52b852453307cabb111115a26178be4cbcc016e53a26a31f783a9df7 SHA512 df007dc98c1acdd31773f7dcf8aeb22812aa55e5593e8509b6a8762f2dcf06c95d69ad7cdce992e7a5fe730754bef26242acdc4e4da51ee29206fabb86c9cb0e
DIST linux-5.9.tar.xz 115507140 BLAKE2B e8d11472d63a9f8409ca12a2e8c97c6963a3d4516b5a398b627d6ece565584526f9b5a1377a2fa4bd184c09c7db94c987428bc5d52df0c788464a67e9e8d6dcb SHA512 d3d92ce4246bad74c9a784212f160d98449b1e8793970c2c308276568d852b8effe0528686bdb87d55d691f09a826abf7938d69bdd4759ce65ddd5c05ffe4eca
-DIST v5.9.7-zen1.patch.xz 603716 BLAKE2B 578f29e72c1dd290e2889ff507e19de2284f323f7ef0d5f27ea3d6a9ddfe694619e85c4f8913f513167a4935fc62394d4f8c22254305eaf11c276fc55105ec45 SHA512 dd60b33dd6ae9896489c1dea74c79e794c23120fd143f6fe328303e20e59a146e471c9ca8eec1451893424a6be53afb3c9a0318c0dae388bea0bbda0ecdd429f
+DIST v5.9.10-zen1.patch.xz 685296 BLAKE2B 6bf669449cb0418ef0532a2c15010b8929a32d4225ac3664de155f9fc6943f3cc9a0fc1a1f37cebc2cf38221a2e7c5b33091bd471e3f42923d7c1e7bc759e800 SHA512 31af40cbdfd4e19cd20be0670b4b2db862c1e742487063111f698f2d6e6786e1a4cc72c68b25727f04a1271318fa645d5ab5bbea58ceae95ac4846edb79a9035
diff --git a/sys-kernel/zen-sources/files/CVE-2020-8694.patch b/sys-kernel/zen-sources/files/CVE-2020-8694.patch
deleted file mode 100644
index f67ee3a3eaa..00000000000
--- a/sys-kernel/zen-sources/files/CVE-2020-8694.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 949dd0104c496fa7c14991a23c03c62e44637e71 Mon Sep 17 00:00:00 2001
-From: Len Brown <len.brown@intel.com>
-Date: Tue, 10 Nov 2020 13:00:00 -0800
-Subject: 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")
-
-Signed-off-by: Len Brown <len.brown@intel.com>
-Cc: stable@vger.kernel.org
----
- drivers/powercap/powercap_sys.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
-index f808c5fa9838c..3f0b8e2ef3d46 100644
---- a/drivers/powercap/powercap_sys.c
-+++ b/drivers/powercap/powercap_sys.c
-@@ -367,9 +367,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;
- }
---
-cgit 1.2.3-1.el7
-
diff --git a/sys-kernel/zen-sources/zen-sources-5.9.7.ebuild b/sys-kernel/zen-sources/zen-sources-5.9.10.ebuild
index c4003834b93..c3dce435487 100644
--- a/sys-kernel/zen-sources/zen-sources-5.9.7.ebuild
+++ b/sys-kernel/zen-sources/zen-sources-5.9.10.ebuild
@@ -37,13 +37,6 @@ pkg_setup() {
kernel-2_pkg_setup
}
-src_prepare() {
- default
-
- kernel-2_src_prepare
- eapply $"${FILESDIR}/CVE-2020-8694.patch"
-}
-
pkg_postrm() {
kernel-2_pkg_postrm
}