Browse code
kernels: Update to version 4.9.99
Change-Id: I4a20197ff18bde1e5332dc581c5973e3e1e0f8fc
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5144
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Srivatsa S. Bhat authored on 2018/05/10 08:09:48Showing 6 changed files
- SPECS/linux-api-headers/linux-api-headers.spec
- SPECS/linux/0001-perf-core-Fix-the-perf_cpu_time_max_percent-check.patch
- SPECS/linux/linux-aws.spec
- SPECS/linux/linux-esx.spec
- SPECS/linux/linux-secure.spec
- SPECS/linux/linux.spec
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: Linux API header files |
| 2 | 2 |
Name: linux-api-headers |
| 3 |
-Version: 4.9.98 |
|
| 3 |
+Version: 4.9.99 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: GPLv2 |
| 6 | 6 |
URL: http://www.kernel.org/ |
| ... | ... |
@@ -8,7 +8,7 @@ Group: System Environment/Kernel |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
|
| 11 |
-%define sha1 linux=5a7f5134f230ebf3f295b67e6232a5087c86fcad |
|
| 11 |
+%define sha1 linux=d35adbca6133a7b5a382bd523f63322d0d56aeff |
|
| 12 | 12 |
BuildArch: noarch |
| 13 | 13 |
%description |
| 14 | 14 |
The Linux API Headers expose the kernel's API for use by Glibc. |
| ... | ... |
@@ -25,6 +25,8 @@ find /%{buildroot}%{_includedir} \( -name .install -o -name ..install.cmd \) -de
|
| 25 | 25 |
%defattr(-,root,root) |
| 26 | 26 |
%{_includedir}/*
|
| 27 | 27 |
%changelog |
| 28 |
+* Wed May 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.99-1 |
|
| 29 |
+- Update to version 4.9.99 |
|
| 28 | 30 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.98-1 |
| 29 | 31 |
- Update to version 4.9.98 |
| 30 | 32 |
* Mon Apr 30 2018 Alexey Makhalov <amakhalov@vmware.com> 4.9.97-1 |
| 31 | 33 |
deleted file mode 100644 |
| ... | ... |
@@ -1,47 +0,0 @@ |
| 1 |
-From 1572e45a924f254d9570093abde46430c3172e3d Mon Sep 17 00:00:00 2001 |
|
| 2 |
-From: Tan Xiaojun <tanxiaojun@huawei.com> |
|
| 3 |
-Date: Thu, 23 Feb 2017 14:04:39 +0800 |
|
| 4 |
-Subject: [PATCH] perf/core: Fix the perf_cpu_time_max_percent check |
|
| 5 |
- |
|
| 6 |
-Use "proc_dointvec_minmax" instead of "proc_dointvec" to check the input |
|
| 7 |
-value from user-space. |
|
| 8 |
- |
|
| 9 |
-If not, we can set a big value and some vars will overflow like |
|
| 10 |
-"sysctl_perf_event_sample_rate" which will cause a lot of unexpected |
|
| 11 |
-problems. |
|
| 12 |
- |
|
| 13 |
-Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com> |
|
| 14 |
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> |
|
| 15 |
-Cc: <acme@kernel.org> |
|
| 16 |
-Cc: <alexander.shishkin@linux.intel.com> |
|
| 17 |
-Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
|
| 18 |
-Cc: Arnaldo Carvalho de Melo <acme@redhat.com> |
|
| 19 |
-Cc: Jiri Olsa <jolsa@redhat.com> |
|
| 20 |
-Cc: Linus Torvalds <torvalds@linux-foundation.org> |
|
| 21 |
-Cc: Peter Zijlstra <peterz@infradead.org> |
|
| 22 |
-Cc: Stephane Eranian <eranian@google.com> |
|
| 23 |
-Cc: Thomas Gleixner <tglx@linutronix.de> |
|
| 24 |
-Cc: Vince Weaver <vincent.weaver@maine.edu> |
|
| 25 |
-Link: http://lkml.kernel.org/r/1487829879-56237-1-git-send-email-tanxiaojun@huawei.com |
|
| 26 |
-Signed-off-by: Ingo Molnar <mingo@kernel.org> |
|
| 27 |
-Signed-off-by: Srivatsa S. Bhat <srivatsa@csail.mit.edu> |
|
| 28 |
- kernel/events/core.c | 2 +- |
|
| 29 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
|
| 30 |
- |
|
| 31 |
-diff --git a/kernel/events/core.c b/kernel/events/core.c |
|
| 32 |
-index b1d6b98..cbc5182 100644 |
|
| 33 |
-+++ b/kernel/events/core.c |
|
| 34 |
-@@ -453,7 +453,7 @@ int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write, |
|
| 35 |
- void __user *buffer, size_t *lenp, |
|
| 36 |
- loff_t *ppos) |
|
| 37 |
- {
|
|
| 38 |
-- int ret = proc_dointvec(table, write, buffer, lenp, ppos); |
|
| 39 |
-+ int ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); |
|
| 40 |
- |
|
| 41 |
- if (ret || !write) |
|
| 42 |
- return ret; |
|
| 43 |
-2.7.4 |
|
| 44 |
- |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
%global security_hardening none |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux-aws |
| 4 |
-Version: 4.9.98 |
|
| 5 |
-Release: 2%{?kat_build:.%kat_build}%{?dist}
|
|
| 4 |
+Version: 4.9.99 |
|
| 5 |
+Release: 1%{?kat_build:.%kat_build}%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| 9 | 9 |
Vendor: VMware, Inc. |
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
|
| 12 |
-%define sha1 linux=5a7f5134f230ebf3f295b67e6232a5087c86fcad |
|
| 12 |
+%define sha1 linux=d35adbca6133a7b5a382bd523f63322d0d56aeff |
|
| 13 | 13 |
Source1: config-aws |
| 14 | 14 |
Source2: initramfs.trigger |
| 15 | 15 |
# common |
| ... | ... |
@@ -49,8 +49,6 @@ Patch33: vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch |
| 49 | 49 |
# Fixes for CVE-2018-1000026 |
| 50 | 50 |
Patch34: 0001-net-create-skb_gso_validate_mac_len.patch |
| 51 | 51 |
Patch35: 0002-bnx2x-disable-GSO-where-gso_size-is-too-big-for-hard.patch |
| 52 |
-# Fix for CVE-2017-18255 |
|
| 53 |
-Patch36: 0001-perf-core-Fix-the-perf_cpu_time_max_percent-check.patch |
|
| 54 | 52 |
# Fix for CVE-2017-18216 |
| 55 | 53 |
Patch37: 0001-ocfs2-subsystem.su_mutex-is-required-while-accessing.patch |
| 56 | 54 |
# Fix for CVE-2018-8043 |
| ... | ... |
@@ -226,7 +224,6 @@ This package contains the 'perf' performance analysis tools for Linux kernel. |
| 226 | 226 |
%patch33 -p1 |
| 227 | 227 |
%patch34 -p1 |
| 228 | 228 |
%patch35 -p1 |
| 229 |
-%patch36 -p1 |
|
| 230 | 229 |
%patch37 -p1 |
| 231 | 230 |
%patch38 -p1 |
| 232 | 231 |
%patch39 -p1 |
| ... | ... |
@@ -451,6 +448,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
|
| 451 | 451 |
/usr/share/doc/* |
| 452 | 452 |
|
| 453 | 453 |
%changelog |
| 454 |
+* Wed May 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.99-1 |
|
| 455 |
+- Update to version 4.9.99 |
|
| 454 | 456 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.98-2 |
| 455 | 457 |
- Fix CVE-2017-18216, CVE-2018-8043, CVE-2018-8087, CVE-2017-18241, |
| 456 | 458 |
- CVE-2017-18224. |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
%global security_hardening none |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux-esx |
| 4 |
-Version: 4.9.98 |
|
| 5 |
-Release: 2%{?dist}
|
|
| 4 |
+Version: 4.9.99 |
|
| 5 |
+Release: 1%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| 9 | 9 |
Vendor: VMware, Inc. |
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
|
| 12 |
-%define sha1 linux=5a7f5134f230ebf3f295b67e6232a5087c86fcad |
|
| 12 |
+%define sha1 linux=d35adbca6133a7b5a382bd523f63322d0d56aeff |
|
| 13 | 13 |
Source1: config-esx |
| 14 | 14 |
Source2: initramfs.trigger |
| 15 | 15 |
# common |
| ... | ... |
@@ -46,8 +46,6 @@ Patch33: vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch |
| 46 | 46 |
# Fixes for CVE-2018-1000026 |
| 47 | 47 |
Patch34: 0001-net-create-skb_gso_validate_mac_len.patch |
| 48 | 48 |
Patch35: 0002-bnx2x-disable-GSO-where-gso_size-is-too-big-for-hard.patch |
| 49 |
-# Fix for CVE-2017-18255 |
|
| 50 |
-Patch36: 0001-perf-core-Fix-the-perf_cpu_time_max_percent-check.patch |
|
| 51 | 49 |
# Fix for CVE-2017-18216 |
| 52 | 50 |
Patch37: 0001-ocfs2-subsystem.su_mutex-is-required-while-accessing.patch |
| 53 | 51 |
# Fix for CVE-2018-8043 |
| ... | ... |
@@ -141,7 +139,6 @@ The Linux package contains the Linux kernel doc files |
| 141 | 141 |
%patch33 -p1 |
| 142 | 142 |
%patch34 -p1 |
| 143 | 143 |
%patch35 -p1 |
| 144 |
-%patch36 -p1 |
|
| 145 | 144 |
%patch37 -p1 |
| 146 | 145 |
%patch38 -p1 |
| 147 | 146 |
%patch39 -p1 |
| ... | ... |
@@ -258,6 +255,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
|
| 258 | 258 |
/usr/src/linux-headers-%{uname_r}
|
| 259 | 259 |
|
| 260 | 260 |
%changelog |
| 261 |
+* Wed May 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.99-1 |
|
| 262 |
+- Update to version 4.9.99 |
|
| 261 | 263 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.98-2 |
| 262 | 264 |
- Fix CVE-2017-18216, CVE-2018-8043, CVE-2018-8087, CVE-2017-18241, |
| 263 | 265 |
- CVE-2017-18224. |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
%global security_hardening none |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux-secure |
| 4 |
-Version: 4.9.98 |
|
| 5 |
-Release: 2%{?kat_build:.%kat_build}%{?dist}
|
|
| 4 |
+Version: 4.9.99 |
|
| 5 |
+Release: 1%{?kat_build:.%kat_build}%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| 9 | 9 |
Vendor: VMware, Inc. |
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
|
| 12 |
-%define sha1 linux=5a7f5134f230ebf3f295b67e6232a5087c86fcad |
|
| 12 |
+%define sha1 linux=d35adbca6133a7b5a382bd523f63322d0d56aeff |
|
| 13 | 13 |
Source1: config-secure |
| 14 | 14 |
Source2: aufs4.9.tar.gz |
| 15 | 15 |
%define sha1 aufs=ebe716ce4b638a3772c7cd3161abbfe11d584906 |
| ... | ... |
@@ -55,8 +55,6 @@ Patch35: vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch |
| 55 | 55 |
# Fixes for CVE-2018-1000026 |
| 56 | 56 |
Patch36: 0001-net-create-skb_gso_validate_mac_len.patch |
| 57 | 57 |
Patch37: 0002-bnx2x-disable-GSO-where-gso_size-is-too-big-for-hard.patch |
| 58 |
-# Fix for CVE-2017-18255 |
|
| 59 |
-Patch38: 0001-perf-core-Fix-the-perf_cpu_time_max_percent-check.patch |
|
| 60 | 58 |
# Fix for CVE-2017-18216 |
| 61 | 59 |
Patch39: 0001-ocfs2-subsystem.su_mutex-is-required-while-accessing.patch |
| 62 | 60 |
# Fix for CVE-2018-8043 |
| ... | ... |
@@ -194,7 +192,6 @@ EOF |
| 194 | 194 |
%patch35 -p1 |
| 195 | 195 |
%patch36 -p1 |
| 196 | 196 |
%patch37 -p1 |
| 197 |
-%patch38 -p1 |
|
| 198 | 197 |
%patch39 -p1 |
| 199 | 198 |
%patch40 -p1 |
| 200 | 199 |
%patch41 -p1 |
| ... | ... |
@@ -347,6 +344,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
|
| 347 | 347 |
/usr/src/linux-headers-%{uname_r}
|
| 348 | 348 |
|
| 349 | 349 |
%changelog |
| 350 |
+* Wed May 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.99-1 |
|
| 351 |
+- Update to version 4.9.99 |
|
| 350 | 352 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.98-2 |
| 351 | 353 |
- Fix CVE-2017-18216, CVE-2018-8043, CVE-2018-8087, CVE-2017-18241, |
| 352 | 354 |
- CVE-2017-18224. |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
%global security_hardening none |
| 2 | 2 |
Summary: Kernel |
| 3 | 3 |
Name: linux |
| 4 |
-Version: 4.9.98 |
|
| 5 |
-Release: 2%{?kat_build:.%kat_build}%{?dist}
|
|
| 4 |
+Version: 4.9.99 |
|
| 5 |
+Release: 1%{?kat_build:.%kat_build}%{?dist}
|
|
| 6 | 6 |
License: GPLv2 |
| 7 | 7 |
URL: http://www.kernel.org/ |
| 8 | 8 |
Group: System Environment/Kernel |
| 9 | 9 |
Vendor: VMware, Inc. |
| 10 | 10 |
Distribution: Photon |
| 11 | 11 |
Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{version}.tar.xz
|
| 12 |
-%define sha1 linux=5a7f5134f230ebf3f295b67e6232a5087c86fcad |
|
| 12 |
+%define sha1 linux=d35adbca6133a7b5a382bd523f63322d0d56aeff |
|
| 13 | 13 |
Source1: config |
| 14 | 14 |
Source2: initramfs.trigger |
| 15 | 15 |
%define ena_version 1.1.3 |
| ... | ... |
@@ -53,8 +53,6 @@ Patch33: vmxnet3-fix-incorrect-dereference-when-rxvlan-is-disabled.patch |
| 53 | 53 |
# Fixes for CVE-2018-1000026 |
| 54 | 54 |
Patch34: 0001-net-create-skb_gso_validate_mac_len.patch |
| 55 | 55 |
Patch35: 0002-bnx2x-disable-GSO-where-gso_size-is-too-big-for-hard.patch |
| 56 |
-# Fix for CVE-2017-18255 |
|
| 57 |
-Patch36: 0001-perf-core-Fix-the-perf_cpu_time_max_percent-check.patch |
|
| 58 | 56 |
# Fix for CVE-2017-18216 |
| 59 | 57 |
Patch37: 0001-ocfs2-subsystem.su_mutex-is-required-while-accessing.patch |
| 60 | 58 |
# Fix for CVE-2018-8043 |
| ... | ... |
@@ -185,7 +183,6 @@ This package contains the 'perf' performance analysis tools for Linux kernel. |
| 185 | 185 |
%patch33 -p1 |
| 186 | 186 |
%patch34 -p1 |
| 187 | 187 |
%patch35 -p1 |
| 188 |
-%patch36 -p1 |
|
| 189 | 188 |
%patch37 -p1 |
| 190 | 189 |
%patch38 -p1 |
| 191 | 190 |
%patch39 -p1 |
| ... | ... |
@@ -373,6 +370,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
|
| 373 | 373 |
/usr/share/doc/* |
| 374 | 374 |
|
| 375 | 375 |
%changelog |
| 376 |
+* Wed May 09 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.99-1 |
|
| 377 |
+- Update to version 4.9.99 |
|
| 376 | 378 |
* Fri May 04 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.9.98-2 |
| 377 | 379 |
- Fix CVE-2017-18216, CVE-2018-8043, CVE-2018-8087, CVE-2017-18241, |
| 378 | 380 |
- CVE-2017-18224. |