From 57504e06c4b8c3b41291da8f36917bc0e1a9830f Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 17 Jun 2019 21:28:20 +0000 Subject: Kernel: [CVE] bump to 4.14.127-mc14 --- system/easy-kernel-power8/APKBUILD | 12 ++-- system/easy-kernel-power8/config-ppc64 | 6 +- system/easy-kernel-power8/futex-cmpxchg.patch | 12 ---- system/easy-kernel-power8/ppc64-epapr-gcc8.patch | 84 ------------------------ 4 files changed, 8 insertions(+), 106 deletions(-) delete mode 100644 system/easy-kernel-power8/futex-cmpxchg.patch delete mode 100644 system/easy-kernel-power8/ppc64-epapr-gcc8.patch (limited to 'system/easy-kernel-power8') diff --git a/system/easy-kernel-power8/APKBUILD b/system/easy-kernel-power8/APKBUILD index fbaec6134..abcbbdc7a 100644 --- a/system/easy-kernel-power8/APKBUILD +++ b/system/easy-kernel-power8/APKBUILD @@ -3,8 +3,8 @@ # KEEP THIS IN SYNC with the other easy-kernel packages. _kflavour=-power8 _pkgname=easy-kernel$_kflavour -pkgver=4.14.88 -pkgrel=13 +pkgver=4.14.127 +pkgrel=14 pkgname=$_pkgname-$pkgver-mc$pkgrel pkgdesc="The Linux kernel, packaged for POWER8 and POWER9 computers" url="https://kernel.org/" @@ -23,8 +23,6 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz ast-endianness.patch config-ppc64 - futex-cmpxchg.patch - ppc64-epapr-gcc8.patch " builddir="$srcdir/linux-${_pkgminver}" @@ -91,8 +89,6 @@ src() { } sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz -bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz +48e0a55cf5b91d0a7e91f950b60afeedc624d7c063b481ce8a13b6362db717171daaeabfaa2de4d9e47b22ef808a6a095b240a61f2b790738d4f6b08aaac9738 linux-4.14-mc14.patch.xz e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch -eae009c8ca87041d3daa000c406196564ff4773186fa69fb3d85f63739093f6ef1cd42dc441561cf6af64ae8a375fc747fbb82a13f389a98b50d066cc6613e4f config-ppc64 -64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch -0df4e823e19e8fc379b5ad66192eb3e890daa3dac8d7a9ebbab4cf3c60ce9f15fcc25a54b86b341db53db3d78c928ca5f55933e12eee75680e705cca8a7bdff4 ppc64-epapr-gcc8.patch" +2e2c4873ef3ecbb4f593c3e6771f5ba3fa80a12c5feda9129044eb94209a26ed093cc78ffda01455acf80860e7c3e8aa353c08f1b3ba2addd46f9772370e7b5c config-ppc64" diff --git a/system/easy-kernel-power8/config-ppc64 b/system/easy-kernel-power8/config-ppc64 index a25fdbec3..48cf1c915 100644 --- a/system/easy-kernel-power8/config-ppc64 +++ b/system/easy-kernel-power8/config-ppc64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.14.88-mc13 Kernel Configuration +# Linux/powerpc 4.14.127-mc14 Kernel Configuration # CONFIG_PPC64=y @@ -53,6 +53,7 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_GENERIC_HWEIGHT=y CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK=y CONFIG_PPC=y +CONFIG_PPC_BARRIER_NOSPEC=y # CONFIG_GENERIC_CSUM is not set CONFIG_EARLY_PRINTK=y CONFIG_PANIC_TIMEOUT=180 @@ -2054,6 +2055,7 @@ CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_N_GSM is not set # CONFIG_TRACE_SINK is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set +CONFIG_LDISC_AUTOLOAD=y CONFIG_DEVMEM=y # CONFIG_DEVKMEM is not set @@ -2104,7 +2106,6 @@ CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_POWERNV=m -# CONFIG_R3964 is not set # CONFIG_APPLICOM is not set CONFIG_RAW_DRIVER=y CONFIG_MAX_RAW_DEVS=256 @@ -4001,6 +4002,7 @@ CONFIG_SUNRPC_GSS=y # CONFIG_CEPH_FS is not set CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set # CONFIG_CIFS_XATTR is not set diff --git a/system/easy-kernel-power8/futex-cmpxchg.patch b/system/easy-kernel-power8/futex-cmpxchg.patch deleted file mode 100644 index 9e2aabfb7..000000000 --- a/system/easy-kernel-power8/futex-cmpxchg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index 9f2b75f..d75d8ea 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -190,6 +190,7 @@ config PPC - select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_GRAPH_TRACER - select HAVE_FUNCTION_TRACER -+ select HAVE_FUTEX_CMPXCHG if FUTEX - select HAVE_GCC_PLUGINS - select HAVE_GENERIC_GUP - select HAVE_HW_BREAKPOINT if PERF_EVENTS && (PPC_BOOK3S || PPC_8xx) diff --git a/system/easy-kernel-power8/ppc64-epapr-gcc8.patch b/system/easy-kernel-power8/ppc64-epapr-gcc8.patch deleted file mode 100644 index 192e83845..000000000 --- a/system/easy-kernel-power8/ppc64-epapr-gcc8.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 186b8f1587c79c2fa04bfa392fdf084443e398c1 Mon Sep 17 00:00:00 2001 -From: Seth Forshee -Date: Thu, 28 Sep 2017 09:33:39 -0400 -Subject: powerpc: Always initialize input array when calling epapr_hypercall() - -Several callers to epapr_hypercall() pass an uninitialized stack -allocated array for the input arguments, presumably because they -have no input arguments. However this can produce errors like -this one - - arch/powerpc/include/asm/epapr_hcalls.h:470:42: error: 'in' may be used uninitialized in this function [-Werror=maybe-uninitialized] - unsigned long register r3 asm("r3") = in[0]; - ~~^~~ - -Fix callers to this function to always zero-initialize the input -arguments array to prevent this. - -Signed-off-by: Seth Forshee -Signed-off-by: Michael Ellerman ---- - arch/powerpc/include/asm/epapr_hcalls.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h -index 334459ad145b..90863245df53 100644 ---- a/arch/powerpc/include/asm/epapr_hcalls.h -+++ b/arch/powerpc/include/asm/epapr_hcalls.h -@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, - - static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - unsigned long r; - -@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) - - static inline long epapr_hypercall0(unsigned int nr) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - return epapr_hypercall(in, out, nr); -@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) - - static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) - static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - unsigned long p2) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, - static inline long epapr_hypercall3(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; -@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, - unsigned long p2, unsigned long p3, - unsigned long p4) - { -- unsigned long in[8]; -+ unsigned long in[8] = {0}; - unsigned long out[8]; - - in[0] = p1; --- -cgit 1.2-0.3.lf.el7 - -- cgit v1.2.3-60-g2f50