Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2019-01-15 09:09:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Tue Jan 15 09:09:04 2019 rev:468 rq:663609 version:4.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2018-12-28 12:33:09.352054008 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new.28833/dtb-aarch64.changes 2019-01-15 09:09:09.486636102 +0100 @@ -1,0 +2,15 @@ +Tue Jan 8 09:38:29 CET 2019 - [email protected] + +- packet: validate address length if non-zero (nmap EINVAL + failure). +- commit 34f009a + +------------------------------------------------------------------- +Mon Dec 24 01:34:19 CET 2018 - [email protected] + +- Update to 4.20 final +- Eliminated 1 patch +- Refresh configs +- commit ba5c149 + +------------------------------------------------------------------- @@ -110,0 +126,7 @@ +Fri Dec 21 20:24:59 CET 2018 - [email protected] + +- rtlwifi: Fix leak of skb when processing C2H_BT_INFO + (bsc#1116448). +- commit 9d82d20 + +------------------------------------------------------------------- @@ -445,0 +468,9 @@ +Mon Dec 17 06:49:50 CET 2018 - [email protected] + +- Update to 4.20-rc7 +- Config changes: + - ARM: + - MEDIA_CONTROLLER_REQUEST_API=y +- commit 4731528 + +------------------------------------------------------------------- @@ -644,0 +676,22 @@ +Mon Dec 10 19:38:45 CET 2018 - [email protected] + +- config: arm: Enable EFI support (boo#1104833) +- commit 7050650 + +------------------------------------------------------------------- +Mon Dec 10 17:25:25 CET 2018 - [email protected] + +- config: armv7hl: Update to 4.20-rc5 +- commit f01387b + +------------------------------------------------------------------- +Mon Dec 10 08:41:00 CET 2018 - [email protected] + +- Delete + patches.suse/blk-mq-fix-corruption-with-direct-issue.patch. + It is in 4.20-rc6 as ffe81d45322c but was partially reverted by + c616cbee97ae, so this patch still applies cleanly, but is unwanted. + Drop it. +- commit 7670339 + +------------------------------------------------------------------- @@ -652,0 +706,8 @@ +Mon Dec 10 07:05:25 CET 2018 - [email protected] + +- Update to 4.20-rc6 +- Eliminated 1 patch +- Refresh configs +- commit 93f10c3 + +------------------------------------------------------------------- @@ -724,0 +786,7 @@ +Sat Dec 8 00:44:22 CET 2018 - [email protected] + +- Include modules.fips in kernel-binary as well as kernel-binary-base + (FATE#323247). +- commit e42315d + +------------------------------------------------------------------- @@ -729 +797,7 @@ -- commit 5fabf51 +- commit fb5fd39 + +------------------------------------------------------------------- +Wed Dec 5 22:36:16 CET 2018 - [email protected] + +- blk-mq: fix corruption with direct issue (bko#201685). +- commit 8970eff @@ -994,0 +1069,6 @@ +Tue Dec 4 13:58:55 CET 2018 - [email protected] + +- blacklist.conf: Blacklist MAINTAINERS file +- commit c4b3c90 + +------------------------------------------------------------------- @@ -1001,0 +1082,6 @@ +Mon Dec 3 14:26:19 CET 2018 - [email protected] + +- config: armv6hl: Update to 4.20-rc5 +- commit c85b385 + +------------------------------------------------------------------- @@ -1006,0 +1093,2 @@ +- config: armv7hl: Build some options as modules (boo#1104833) + Enable HISI_THERMAL=m while at it. @@ -1015,0 +1104,13 @@ +Mon Dec 3 07:27:25 CET 2018 - [email protected] + +- Update to 4.20-rc5 +- Config changes: + - General: + - PSI_DEFAULT_DISABLED=y + - Sound: + - SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y + - ARM: + - ARM64_ERRATUM_1286807=y +- commit 2ccaf30 + +------------------------------------------------------------------- @@ -1407,0 +1509,15 @@ +Mon Nov 26 07:22:42 CET 2018 - [email protected] + +- Update to 4.20-rc4 +- Config changes: + - Networking: + - MT76_LEDS=y (split from MT76_CORE) +- commit 1ac69b7 + +------------------------------------------------------------------- +Fri Nov 23 18:47:44 CET 2018 - [email protected] + +- Build ppc64le for POWER8+ (FATE#325617). +- commit f6da51b + +------------------------------------------------------------------- @@ -1484,0 +1601,9 @@ +Fri Nov 23 00:55:31 CET 2018 - [email protected] + +- Revert "Remove Cell/PS3 support from ppc64 kernel (boo#1114846)" + This reverts commit fd6aaf7f98693355e7dcc5e4e1926fb1664d803b. + Fixed upstream in 43c6494fa149 ("powerpc/io: Fix the IO workarounds code + to work with Radix") +- commit 4f86993 + +------------------------------------------------------------------- @@ -1830,0 +1956,6 @@ +Tue Nov 20 14:26:50 CET 2018 - [email protected] + +- apparmor: fix unnecessary creation of net-compat (bsc#1116724). +- commit f5cf767 + +------------------------------------------------------------------- @@ -1836,0 +1968,7 @@ +Mon Nov 19 07:08:48 CET 2018 - [email protected] + +- Update to 4.20-rc3 +- Refresh configs +- commit 81d20d2 + +------------------------------------------------------------------- @@ -2435,0 +2574,18 @@ +Mon Nov 12 07:01:19 CET 2018 - [email protected] + +- Update to 4.20-rc2 +- Eliminated 1 patch +- Config changes: + - I2C: + I2C_NVIDIA_GPU=m + - USB: + UCSI_CCG=m +- commit 1c08d7f + +------------------------------------------------------------------- +Sun Nov 11 19:26:40 CET 2018 - [email protected] + +- config: arm64: Update to 4.20-rc1 +- commit 2d02cd8 + +------------------------------------------------------------------- @@ -2448,0 +2605,6 @@ +Tue Nov 6 14:08:44 CET 2018 - [email protected] + +- config: reenable BPFILTER_UMH on ppc64 +- commit 46cb36e + +------------------------------------------------------------------- @@ -2454,0 +2617,6 @@ +Mon Nov 5 18:28:38 CET 2018 - [email protected] + +- scripts/mkmakefile: honor second argument. +- commit 78325a6 + +------------------------------------------------------------------- @@ -2462,0 +2631,14 @@ +Mon Nov 5 14:16:00 CET 2018 - [email protected] + +- series.conf: delete an obsolete comment +- commit c3bd57d + +------------------------------------------------------------------- +Mon Nov 5 08:30:26 CET 2018 - [email protected] + +- Refresh ++++ 106 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.28833/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-kvmsmall.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change Old: ---- linux-4.19.tar.xz New: ---- linux-4.20.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.678620291 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.678620291 +0100 @@ -1,7 +1,7 @@ # # spec file for package dtb-aarch64 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols}) Name: dtb-aarch64 -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.726620247 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.726620247 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-64kb # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 # END COMMON DEPS -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1044,6 +1044,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save @@ -1132,8 +1133,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %obsolete_rebuilds %name-base %ifarch %ix86 ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.738620236 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.742620233 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-debug # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 # END COMMON DEPS -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 @@ -1050,6 +1050,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save @@ -1138,8 +1139,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %ifarch ppc64 Provides: kernel-kdump-base = 2.6.28 ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.754620222 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.754620222 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-default # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 # END COMMON DEPS -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 @@ -1093,6 +1093,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save @@ -1181,8 +1182,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %ifarch %ix86 Provides: kernel-trace-base = 3.13 ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.770620207 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.774620203 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-docs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,8 @@ # -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -63,7 +63,7 @@ %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz ++++++ kernel-kvmsmall.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.790620188 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.790620188 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-kvmsmall # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Small Developer Kernel for KVM License: GPL-2.0 Group: System/Kernel -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 # END COMMON DEPS -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1048,6 +1048,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save @@ -1136,8 +1137,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %obsolete_rebuilds %name-base %ifarch %ix86 kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.826620155 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.826620155 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-obs-build # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.19.12 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -45,7 +45,7 @@ %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash = c634493cc649767a69445e492031b9c1e93364fb +BuildRequires: kernel%kernel_flavor-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %if 0%{?rhel_version} BuildRequires: kernel @@ -64,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.842620141 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.846620136 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-obs-qa # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.19.12 +%define patchversion 4.20.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.862620121 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.862620121 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-pae # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 # END COMMON DEPS -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 @@ -1070,6 +1070,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save @@ -1158,8 +1159,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %ifarch %ix86 Provides: kernel-vmi-base = 2.6.38 ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.882620104 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.882620104 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-source # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.902620085 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.902620085 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-syms # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.19.12 +Version: 4.20.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -55,7 +55,7 @@ %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:26.918620070 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:26.922620067 +0100 @@ -1,7 +1,7 @@ # # spec file for package kernel-vanilla # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.19 -%define patchversion 4.19.12 +%define srcversion 4.20 +%define patchversion 4.20.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 4.19.12 +Version: 4.20.0 %if 0%{?is_kotd} -Release: <RELEASE>.gc634493 +Release: <RELEASE>.g34f009a %else Release: 0 %endif @@ -165,10 +165,10 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 # END COMMON DEPS -Provides: %name-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: %name-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh @@ -1041,6 +1041,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save @@ -1129,8 +1130,8 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash = c634493cc649767a69445e492031b9c1e93364fb -Provides: kernel-srchash = c634493cc649767a69445e492031b9c1e93364fb +Provides: kernel-%build_flavor-base-srchash = 34f009a915d109328e0960dd99d877df9b22af78 +Provides: kernel-srchash = 34f009a915d109328e0960dd99d877df9b22af78 %obsolete_rebuilds %name-base %ifarch %ix86 kernel-zfcpdump.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:27.090619913 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:27.090619913 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.19 +SRCVERSION=4.20 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 6371 lines of diff (skipped) ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:27.386619639 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:27.390619637 +0100 @@ -913,6 +913,7 @@ if [ %CONFIG_MODULES = y ]; then install -m 644 %_sourcedir/modules.fips %{buildroot}/lib/modules/%kernelrelease-%build_flavor/modules.fips echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-base.files + echo /lib/modules/%kernelrelease-%build_flavor/modules.fips >> %my_builddir/kernel-main.files fi # Hardlink duplicate files automatically (from package fdupes): It doesn't save ++++++ linux-4.19.tar.xz -> linux-4.20.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.19.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new.28833/linux-4.20.tar.xz differ: char 15, line 1 ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 118606 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch new/patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch --- old/patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch 2018-12-20 10:45:14.000000000 +0100 +++ new/patches.rpmify/powerpc-Blacklist-GCC-5.4-6.1-and-6.2.patch 2018-12-24 01:35:26.000000000 +0100 @@ -27,22 +27,20 @@ --- v2: Added check to only blacklist compilers on little-endian - arch/powerpc/Makefile | 11 +++++++++++ - 1 file changed, 11 insertions(+) + arch/powerpc/Makefile | 10 ++++++++++ + 1 file changed, 10 insertions(+) -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 31286fa7873c..db5d8dabf1ca 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -381,6 +381,7 @@ TOUT := .tmp_gas_check - # - gcc-3.4 and binutils-2.14 are a fatal combination - # - Require gcc 4.0 or above on 64-bit - # - gcc-4.2.0 has issues compiling modules on 64-bit +@@ -415,6 +415,7 @@ endif + + # Check toolchain versions: + # - gcc-4.6 is the minimum kernel-wide version so nothing required. +# - gcc-5.4, 6.1, 6.2 don't copy the command_line around correctly checkbin: - @if test "$(cc-name)" != "clang" \ - && test "$(cc-version)" = "0304" ; then \ -@@ -414,6 +415,16 @@ checkbin: + @if test "x${CONFIG_CPU_LITTLE_ENDIAN}" = "xy" \ + && $(LD) --version | head -1 | grep ' 2\.24$$' >/dev/null ; then \ +@@ -423,3 +424,12 @@ checkbin: echo -n '*** Please use a different binutils version.' ; \ false ; \ fi @@ -55,10 +53,3 @@ + echo '*** Please use a different GCC version.' ; \ + false ; \ + fi -+ - - - CLEAN_FILES += $(TOUT) --- -2.11.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch new/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch --- old/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch 2018-12-24 01:35:26.000000000 +0100 @@ -0,0 +1,27 @@ +From: Michal Kubecek <[email protected]> +Date: Mon, 5 Nov 2018 13:43:02 +0100 +Subject: scripts/mkmakefile: honor second argument +Patch-mainline: Never, SUSE specific +References: none + +Commit 4fd61277f662 ("kbuild: do not pass $(objtree) to +scripts/mkmakefile") assumes mkmakefile is always used to generate a +makefile in current directory. This is not true when generating makefile +for our kernel-*-devel package. + +Signed-off-by: Michal Kubecek <[email protected]> +--- + scripts/mkmakefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/mkmakefile ++++ b/scripts/mkmakefile +@@ -17,7 +17,7 @@ if [ "${quiet}" != "silent_" ]; then + echo " GEN Makefile" + fi + +-cat << EOF > Makefile ++cat << EOF > "${2:-.}/Makefile" + # Automatically generated by $0: don't edit + + ifeq ("\$(origin V)", "command line") ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-apparmor-fix-unnecessary-creation-of-net-compat.patch new/patches.suse/0001-apparmor-fix-unnecessary-creation-of-net-compat.patch --- old/patches.suse/0001-apparmor-fix-unnecessary-creation-of-net-compat.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/0001-apparmor-fix-unnecessary-creation-of-net-compat.patch 2019-01-08 09:38:29.000000000 +0100 @@ -0,0 +1,49 @@ +From 0256a7f382670a4f07b6b6068371f1463c251325 Mon Sep 17 00:00:00 2001 +From: Goldwyn Rodrigues <[email protected]> +Date: Tue, 20 Nov 2018 06:36:26 -0600 +Subject: [PATCH] apparmor: fix unnecessary creation of net-compat +Patch-mainline: Never, fixes a compat patch +References: bsc#1116724 + +We do not want to create net-compat all of the time, +only when there are rules in profile AND version is less +than 8. This will improve performance for cases which +does not have net rules in profile but uses networking. + +Also, remove a bogus condition. + +Signed-off-by: Goldwyn Rodrigues <[email protected]> +--- + security/apparmor/net.c | 2 -- + security/apparmor/policy_unpack.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/security/apparmor/net.c b/security/apparmor/net.c +index 042aee4408c1..b19778a1798d 100644 +--- a/security/apparmor/net.c ++++ b/security/apparmor/net.c +@@ -174,8 +174,6 @@ int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa, + return 0; + state = PROFILE_MEDIATES(profile, AA_CLASS_NET); + if (state) { +- if (!state) +- return 0; + buffer[0] = cpu_to_be16(family); + buffer[1] = cpu_to_be16((u16) type); + state = aa_dfa_match_len(profile->policy.dfa, state, +diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c +index 9c9a329fd2d7..3d6fa51178c4 100644 +--- a/security/apparmor/policy_unpack.c ++++ b/security/apparmor/policy_unpack.c +@@ -773,7 +773,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) + } + + size = unpack_array(e, "net_allowed_af"); +- if (size || VERSION_LT(e->version, v8)) { ++ if (size && VERSION_LT(e->version, v8)) { + profile->net_compat = kzalloc(sizeof(struct aa_net_compat), GFP_KERNEL); + if (!profile->net_compat) { + info = "out of memory"; +-- +2.16.4 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch new/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch --- old/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/0001-x86-speculation-Add-basic-IBRS-support-infrastructur.patch 2019-01-08 09:38:29.000000000 +0100 @@ -23,21 +23,22 @@ Signed-off-by: Jiri Slaby <[email protected]> SUSE: added back SPECTRE_V2_IBRS removed by mainline commit d9f4426c7300 -("x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation") -and is_skylake_era() removed by commit fdf82a7856b3 ("x86/speculation: -Protect against userspace-userspace spectreRSB"). +("x86/speculation: Remove SPECTRE_V2_IBRS in enum spectre_v2_mitigation"), +is_skylake_era() removed by commit fdf82a7856b3 ("x86/speculation: Protect +against userspace-userspace spectreRSB") and retp_compiler() removed by +commit ef014aae8f1c ("x86/retpoline: Remove minimal retpoline support"). --- - Documentation/admin-guide/kernel-parameters.txt | 1 - arch/x86/include/asm/cpufeatures.h | 1 - arch/x86/include/asm/nospec-branch.h | 3 - - arch/x86/kernel/cpu/bugs.c | 39 ++++++++++++++++++++++++ - arch/x86/lib/Makefile | 2 - - arch/x86/lib/retpoline.S | 5 +++ + .../admin-guide/kernel-parameters.txt | 1 + + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/nospec-branch.h | 3 +- + arch/x86/kernel/cpu/bugs.c | 39 +++++++++++++++++++ + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/retpoline.S | 5 +++ 6 files changed, 48 insertions(+), 3 deletions(-) --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4196,6 +4196,7 @@ +@@ -4226,6 +4226,7 @@ retpoline - replace indirect branches retpoline,generic - google's original retpoline retpoline,amd - AMD-specific minimal thunk @@ -83,7 +84,19 @@ static __always_inline --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c -@@ -249,6 +249,7 @@ enum spectre_v2_mitigation_cmd { +@@ -234,6 +234,11 @@ static inline const char *spectre_v2_module_string(void) + static inline const char *spectre_v2_module_string(void) { return ""; } + #endif + ++static inline bool retp_compiler(void) ++{ ++ return __is_defined(CONFIG_RETPOLINE); ++} ++ + static inline bool match_option(const char *arg, int arglen, const char *opt) + { + int len = strlen(opt); +@@ -249,6 +254,7 @@ enum spectre_v2_mitigation_cmd { SPECTRE_V2_CMD_RETPOLINE, SPECTRE_V2_CMD_RETPOLINE_GENERIC, SPECTRE_V2_CMD_RETPOLINE_AMD, @@ -91,7 +104,7 @@ }; enum spectre_v2_user_cmd { -@@ -400,6 +401,7 @@ static const char * const spectre_v2_str +@@ -400,6 +406,7 @@ static const char * const spectre_v2_strings[] = { [SPECTRE_V2_NONE] = "Vulnerable", [SPECTRE_V2_RETPOLINE_GENERIC] = "Mitigation: Full generic retpoline", [SPECTRE_V2_RETPOLINE_AMD] = "Mitigation: Full AMD retpoline", @@ -99,7 +112,7 @@ [SPECTRE_V2_IBRS_ENHANCED] = "Mitigation: Enhanced IBRS", }; -@@ -413,6 +415,7 @@ static const struct { +@@ -413,6 +420,7 @@ static const struct { { "retpoline", SPECTRE_V2_CMD_RETPOLINE, false }, { "retpoline,amd", SPECTRE_V2_CMD_RETPOLINE_AMD, false }, { "retpoline,generic", SPECTRE_V2_CMD_RETPOLINE_GENERIC, false }, @@ -107,7 +120,7 @@ { "auto", SPECTRE_V2_CMD_AUTO, false }, }; -@@ -466,6 +469,28 @@ static enum spectre_v2_mitigation_cmd __ +@@ -467,6 +475,23 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) return cmd; } @@ -128,15 +141,10 @@ + return false; +} + -+static inline bool retp_compiler(void) -+{ -+ return __is_defined(CONFIG_RETPOLINE); -+} -+ static void __init spectre_v2_select_mitigation(void) { enum spectre_v2_mitigation_cmd cmd = spectre_v2_parse_cmdline(); -@@ -492,17 +517,31 @@ static void __init spectre_v2_select_mit +@@ -493,17 +518,31 @@ static void __init spectre_v2_select_mitigation(void) wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); goto specv2_set_mode; } @@ -170,7 +178,7 @@ goto retpoline_auto; --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile -@@ -27,7 +27,7 @@ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += +@@ -27,7 +27,7 @@ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o lib-$(CONFIG_INSTRUCTION_DECODER) += insn.o inat.o insn-eval.o lib-$(CONFIG_RANDOMIZE_BASE) += kaslr.o lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch new/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch --- old/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/0002-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch 2019-01-08 09:38:29.000000000 +0100 @@ -23,12 +23,12 @@ Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- - arch/x86/include/asm/nospec-branch.h | 36 +++++++++++++++++++++++++++++++++++ + arch/x86/include/asm/nospec-branch.h | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h -@@ -316,6 +316,42 @@ DECLARE_STATIC_KEY_FALSE(switch_to_cond_ +@@ -316,6 +316,42 @@ DECLARE_STATIC_KEY_FALSE(switch_to_cond_stibp); DECLARE_STATIC_KEY_FALSE(switch_mm_cond_ibpb); DECLARE_STATIC_KEY_FALSE(switch_mm_always_ibpb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0005-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch new/patches.suse/0005-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch --- old/patches.suse/0005-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/0005-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch 2019-01-08 09:38:29.000000000 +0100 @@ -72,31 +72,22 @@ Link: https://lkml.kernel.org/r/d5e4c03ec290c61dfbe5a769f7287817283fa6b7.1515542293.git.tim.c.c...@linux.intel.com Signed-off-by: Jiri Slaby <[email protected]> --- - arch/x86/entry/entry_64.S | 35 +++++++++++++++++++++++++++++++- - arch/x86/entry/entry_64_compat.S | 23 +++++++++++++++++++-- - 2 files changed, 55 insertions(+), 3 deletions(-) + arch/x86/entry/entry_64.S | 32 ++++++++++++++++++++++++++++++++ + arch/x86/entry/entry_64_compat.S | 23 +++++++++++++++++++++-- + 2 files changed, 53 insertions(+), 2 deletions(-) --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S -@@ -175,6 +175,8 @@ ENTRY(entry_SYSCALL_64_trampoline) - - /* Load the top of the task stack into RSP */ - movq CPU_ENTRY_AREA_tss + TSS_sp1 + CPU_ENTRY_AREA, %rsp -+ /* Restrict indirect branch speculation */ -+ RESTRICT_IB_SPEC - - /* Start building the simulated IRET frame. */ - pushq $__USER_DS /* pt_regs->ss */ -@@ -218,6 +220,8 @@ ENTRY(entry_SYSCALL_64) - */ - movq %rsp, PER_CPU_VAR(rsp_scratch) +@@ -155,6 +155,8 @@ ENTRY(entry_SYSCALL_64) + movq %rsp, PER_CPU_VAR(cpu_tss_rw + TSS_sp2) + SWITCH_TO_KERNEL_CR3 scratch_reg=%rsp movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp + /* Restrict Indirect Branch Speculation */ + RESTRICT_IB_SPEC /* Construct struct pt_regs on stack */ - pushq $__USER_DS /* pt_regs->ss */ -@@ -325,6 +329,8 @@ syscall_return_via_sysret: + pushq $__USER_DS /* pt_regs->ss */ +@@ -262,6 +264,8 @@ syscall_return_via_sysret: pushq RSP-RDI(%rdi) /* RSP */ pushq (%rdi) /* RDI */ @@ -105,7 +96,7 @@ /* * We are on the trampoline stack. All regs except RDI are live. * We can do future final exit work right here. -@@ -581,6 +587,8 @@ ENTRY(interrupt_entry) +@@ -520,6 +524,8 @@ ENTRY(interrupt_entry) SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi movq %rsp, %rdi movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp @@ -114,7 +105,7 @@ /* * We have RDI, return address, and orig_ax on the stack on -@@ -684,11 +692,12 @@ GLOBAL(swapgs_restore_regs_and_return_to_usermode) +@@ -623,6 +629,8 @@ GLOBAL(swapgs_restore_regs_and_return_to /* Push user RDI on the trampoline stack. */ pushq (%rdi) @@ -123,12 +114,7 @@ /* * We are on the trampoline stack. All regs except RDI are live. * We can do future final exit work right here. - */ -- - SWITCH_TO_USER_CR3_STACK scratch_reg=%rdi - - /* Restore RDI. */ -@@ -779,6 +788,13 @@ native_irq_return_ldt: +@@ -719,6 +727,13 @@ native_irq_return_ldt: SWAPGS /* to kernel GS */ SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi /* to kernel CR3 */ @@ -142,7 +128,7 @@ movq PER_CPU_VAR(espfix_waddr), %rdi movq %rax, (0*8)(%rdi) /* user RAX */ movq (1*8)(%rsp), %rax /* user RIP */ -@@ -1198,6 +1214,8 @@ ENTRY(paranoid_entry) +@@ -1176,6 +1191,8 @@ ENTRY(paranoid_entry) * to kernel code, but with a user CR3 value. */ SAVE_AND_SWITCH_TO_KERNEL_CR3 scratch_reg=%rax save_reg=%r14 @@ -151,7 +137,7 @@ ret END(paranoid_entry) -@@ -1221,6 +1239,8 @@ ENTRY(paranoid_exit) +@@ -1199,6 +1216,8 @@ ENTRY(paranoid_exit) testl %ebx, %ebx /* swapgs needed? */ jnz .Lparanoid_exit_no_swapgs TRACE_IRQS_IRETQ @@ -160,7 +146,7 @@ /* Always restore stashed CR3 value (see paranoid_entry) */ RESTORE_CR3 scratch_reg=%rbx save_reg=%r14 SWAPGS_UNSAFE_STACK -@@ -1251,6 +1271,8 @@ ENTRY(error_entry) +@@ -1229,6 +1248,8 @@ ENTRY(error_entry) SWAPGS /* We have user CR3. Change to kernel CR3. */ SWITCH_TO_KERNEL_CR3 scratch_reg=%rax @@ -169,7 +155,7 @@ .Lerror_entry_from_usermode_after_swapgs: /* Put us onto the real thread stack. */ -@@ -1297,6 +1319,8 @@ ENTRY(error_entry) +@@ -1275,6 +1296,8 @@ ENTRY(error_entry) */ SWAPGS SWITCH_TO_KERNEL_CR3 scratch_reg=%rax @@ -178,7 +164,7 @@ jmp .Lerror_entry_done .Lbstep_iret: -@@ -1311,6 +1335,8 @@ ENTRY(error_entry) +@@ -1289,6 +1312,8 @@ ENTRY(error_entry) */ SWAPGS SWITCH_TO_KERNEL_CR3 scratch_reg=%rax @@ -187,7 +173,7 @@ /* * Pretend that the exception came from user mode: set up pt_regs -@@ -1404,6 +1430,10 @@ ENTRY(nmi) +@@ -1382,6 +1407,10 @@ ENTRY(nmi) SWITCH_TO_KERNEL_CR3 scratch_reg=%rdx movq %rsp, %rdx movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp @@ -198,7 +184,7 @@ UNWIND_HINT_IRET_REGS base=%rdx offset=8 pushq 5*8(%rdx) /* pt_regs->ss */ pushq 4*8(%rdx) /* pt_regs->rsp */ -@@ -1638,6 +1668,9 @@ end_repeat_nmi: +@@ -1616,6 +1645,9 @@ end_repeat_nmi: movq $-1, %rsi call do_nmi @@ -219,7 +205,7 @@ /* * User tracing code (ptrace or signal handlers) might assume that -@@ -247,12 +249,18 @@ GLOBAL(entry_SYSCALL_compat_after_hwframe) +@@ -247,12 +249,18 @@ GLOBAL(entry_SYSCALL_compat_after_hwfram pushq $0 /* pt_regs->r15 = 0 */ xorl %r15d, %r15d /* nospec r15 */ @@ -240,9 +226,9 @@ movq %rsp, %rdi call do_fast_syscall_32 /* XEN PV guests always use IRET path */ -@@ -262,6 +270,15 @@ GLOBAL(entry_SYSCALL_compat_after_hwframe) - /* Opportunistic SYSRET */ - sysret32_from_system_call: +@@ -267,6 +275,15 @@ sysret32_from_system_call: + */ + STACKLEAK_ERASE TRACE_IRQS_ON /* User mode traces as IRQs on. */ + + /* @@ -256,7 +242,7 @@ movq RBX(%rsp), %rbx /* pt_regs->rbx */ movq RBP(%rsp), %rbp /* pt_regs->rbp */ movq EFLAGS(%rsp), %r11 /* pt_regs->flags (in r11) */ -@@ -358,6 +375,8 @@ ENTRY(entry_INT80_compat) +@@ -363,6 +380,8 @@ ENTRY(entry_INT80_compat) SWITCH_TO_KERNEL_CR3 scratch_reg=%rdi movq %rsp, %rdi movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/apparmor-compatibility-with-v2.x-net.patch new/patches.suse/apparmor-compatibility-with-v2.x-net.patch --- old/patches.suse/apparmor-compatibility-with-v2.x-net.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/apparmor-compatibility-with-v2.x-net.patch 2019-01-08 09:38:29.000000000 +0100 @@ -17,18 +17,16 @@ --- security/apparmor/apparmorfs.c | 1 + security/apparmor/include/apparmor.h | 2 +- - security/apparmor/include/net.h | 11 ++++++++ + security/apparmor/include/net.h | 11 ++++++ security/apparmor/include/policy.h | 2 ++ - security/apparmor/net.c | 31 ++++++++++++++++----- + security/apparmor/net.c | 31 ++++++++++++---- security/apparmor/policy.c | 1 + - security/apparmor/policy_unpack.c | 54 ++++++++++++++++++++++++++++++++++-- + security/apparmor/policy_unpack.c | 54 ++++++++++++++++++++++++++-- 7 files changed, 92 insertions(+), 10 deletions(-) -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index 1fdcc7d5a977..32f0e660ffd0 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c -@@ -2272,6 +2272,7 @@ static struct aa_sfs_entry aa_sfs_entry_features[] = { +@@ -2269,6 +2269,7 @@ static struct aa_sfs_entry aa_sfs_entry_features[] = { AA_SFS_DIR("domain", aa_sfs_entry_domain), AA_SFS_DIR("file", aa_sfs_entry_file), AA_SFS_DIR("network_v8", aa_sfs_entry_network), @@ -36,8 +34,6 @@ AA_SFS_DIR("mount", aa_sfs_entry_mount), AA_SFS_DIR("namespaces", aa_sfs_entry_ns), AA_SFS_FILE_U64("capability", VFS_CAP_FLAGS_MASK), -diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h -index 73d63b58d875..17d89f3badc6 100644 --- a/security/apparmor/include/apparmor.h +++ b/security/apparmor/include/apparmor.h @@ -24,7 +24,7 @@ @@ -49,8 +45,6 @@ #define AA_CLASS_RLIMITS 5 #define AA_CLASS_DOMAIN 6 #define AA_CLASS_MOUNT 7 -diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h -index ec7228e857a9..579b59a40ea4 100644 --- a/security/apparmor/include/net.h +++ b/security/apparmor/include/net.h @@ -72,6 +72,16 @@ struct aa_sk_ctx { @@ -70,16 +64,14 @@ #define af_select(FAMILY, FN, DEF_FN) \ ({ \ -@@ -84,6 +94,7 @@ struct aa_sk_ctx { - }) +@@ -91,6 +101,7 @@ struct aa_secmark { + }; extern struct aa_sfs_entry aa_sfs_entry_network[]; +extern struct aa_sfs_entry aa_sfs_entry_network_compat[]; void audit_net_cb(struct audit_buffer *ab, void *va); int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa, -diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h -index 6c93e62383e6..4006fa9fc9f1 100644 --- a/security/apparmor/include/policy.h +++ b/security/apparmor/include/policy.h @@ -112,6 +112,7 @@ struct aa_data { @@ -98,11 +90,9 @@ int xattr_count; char **xattrs; -diff --git a/security/apparmor/net.c b/security/apparmor/net.c -index bb24cfa0a164..bf6aaefc3a5f 100644 --- a/security/apparmor/net.c +++ b/security/apparmor/net.c -@@ -27,6 +27,11 @@ struct aa_sfs_entry aa_sfs_entry_network[] = { +@@ -28,6 +28,11 @@ struct aa_sfs_entry aa_sfs_entry_network[] = { { } }; @@ -114,7 +104,7 @@ static const char * const net_mask_names[] = { "unknown", "send", -@@ -119,14 +124,26 @@ int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa, +@@ -120,14 +125,26 @@ int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa, if (profile_unconfined(profile)) return 0; state = PROFILE_MEDIATES(profile, AA_CLASS_NET); @@ -148,8 +138,6 @@ aa_apply_modes_to_perms(profile, &perms); return aa_check_perms(profile, &perms, request, sa, audit_net_cb); -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index c07493ce2376..d1a869699040 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -227,6 +227,7 @@ void aa_free_profile(struct aa_profile *profile) @@ -160,8 +148,6 @@ for (i = 0; i < profile->xattr_count; i++) kzfree(profile->xattrs[i]); -diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c -index b9e6b2cafa69..a1b07e6c163d 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -37,7 +37,7 @@ @@ -173,7 +159,7 @@ #define v8 8 /* full network masking */ /* -@@ -292,6 +292,19 @@ static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name) +@@ -305,6 +305,19 @@ static bool unpack_u8(struct aa_ext *e, u8 *data, const char *name) return 0; } @@ -193,7 +179,7 @@ static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name) { if (unpack_nameX(e, AA_U32, name)) { -@@ -621,7 +634,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) +@@ -645,7 +658,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) struct aa_profile *profile = NULL; const char *tmpname, *tmpns = NULL, *name = NULL; const char *info = "failed to unpack profile"; @@ -202,7 +188,7 @@ struct rhashtable_params params = { 0 }; char *key = NULL; struct aa_data *data; -@@ -759,6 +772,43 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) +@@ -788,6 +801,43 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) goto fail; } @@ -246,6 +232,3 @@ if (unpack_nameX(e, AA_STRUCT, "policydb")) { /* generic policy dfa - optional and may be NULL */ info = "failed to unpack policydb"; --- -2.14.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch new/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch --- old/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/kernel-add-product-identifying-information-to-kernel-build.patch 2019-01-08 09:38:29.000000000 +0100 @@ -46,7 +46,7 @@ --- a/Makefile +++ b/Makefile -@@ -958,6 +958,15 @@ ifdef CONFIG_STACK_VALIDATION +@@ -972,6 +972,15 @@ ifdef CONFIG_STACK_VALIDATION endif endif @@ -62,7 +62,7 @@ ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ -@@ -1087,7 +1096,8 @@ endif +@@ -1101,7 +1110,8 @@ endif # that need to depend on updated CONFIG_* values can be checked here. prepare2: prepare3 outputmakefile asm-generic @@ -275,7 +275,7 @@ /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; -@@ -2374,6 +2375,14 @@ static void add_srcversion(struct buffer *b, struct module *mod) +@@ -2375,6 +2376,14 @@ static void add_srcversion(struct buffer *b, struct module *mod) } } @@ -290,7 +290,7 @@ static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2634,6 +2643,7 @@ int main(int argc, char **argv) +@@ -2635,6 +2644,7 @@ int main(int argc, char **argv) add_depends(&buf, mod, modules); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mm-add-mm_pxd_folded-checks-to-pgtable_bytes-account.patch new/patches.suse/mm-add-mm_pxd_folded-checks-to-pgtable_bytes-account.patch --- old/patches.suse/mm-add-mm_pxd_folded-checks-to-pgtable_bytes-account.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/mm-add-mm_pxd_folded-checks-to-pgtable_bytes-account.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -From 6d212db11947ae5464e4717536ed9faf61c01e86 Mon Sep 17 00:00:00 2001 -From: Martin Schwidefsky <[email protected]> -Date: Mon, 15 Oct 2018 10:30:23 +0200 -Subject: [PATCH 3/4] mm: add mm_pxd_folded checks to pgtable_bytes accounting - functions - -References: s390/mm: fix mis-accounting of pgtable_bytes -Patch-mainline: v4.20-rc2 -Git-commit: 6d212db11947ae5464e4717536ed9faf61c01e86 - -The common mm code calls mm_dec_nr_pmds() and mm_dec_nr_puds() -in free_pgtables() if the address range spans a full pud or pmd. -If mm_dec_nr_puds/mm_dec_nr_pmds are non-empty due to configuration -settings they blindly subtract the size of the pmd or pud table from -pgtable_bytes even if the pud or pmd page table layer is folded. - -Add explicit mm_[pmd|pud]_folded checks to the four pgtable_bytes -accounting functions mm_inc_nr_puds, mm_inc_nr_pmds, mm_dec_nr_puds -and mm_dec_nr_pmds. As the check for folded page tables can be -overwritten by the architecture, this allows to keep a correct -pgtable_bytes value for platforms that use a dynamic number of -page table levels. - -Acked-by: Kirill A. Shutemov <[email protected]> -Signed-off-by: Martin Schwidefsky <[email protected]> -Acked-by: Michal Suchanek <[email protected]> ---- - include/linux/mm.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/include/linux/mm.h b/include/linux/mm.h -index daa2b8f1e9a8..a3701e91bb57 100644 ---- a/include/linux/mm.h -+++ b/include/linux/mm.h -@@ -1742,11 +1742,15 @@ int __pud_alloc(struct mm_struct *mm, p4d_t *p4d, unsigned long address); - - static inline void mm_inc_nr_puds(struct mm_struct *mm) - { -+ if (mm_pud_folded(mm)) -+ return; - atomic_long_add(PTRS_PER_PUD * sizeof(pud_t), &mm->pgtables_bytes); - } - - static inline void mm_dec_nr_puds(struct mm_struct *mm) - { -+ if (mm_pud_folded(mm)) -+ return; - atomic_long_sub(PTRS_PER_PUD * sizeof(pud_t), &mm->pgtables_bytes); - } - #endif -@@ -1766,11 +1770,15 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address); - - static inline void mm_inc_nr_pmds(struct mm_struct *mm) - { -+ if (mm_pmd_folded(mm)) -+ return; - atomic_long_add(PTRS_PER_PMD * sizeof(pmd_t), &mm->pgtables_bytes); - } - - static inline void mm_dec_nr_pmds(struct mm_struct *mm) - { -+ if (mm_pmd_folded(mm)) -+ return; - atomic_long_sub(PTRS_PER_PMD * sizeof(pmd_t), &mm->pgtables_bytes); - } - #endif --- -2.19.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mm-introduce-mm_-p4d-pud-pmd-_folded.patch new/patches.suse/mm-introduce-mm_-p4d-pud-pmd-_folded.patch --- old/patches.suse/mm-introduce-mm_-p4d-pud-pmd-_folded.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/mm-introduce-mm_-p4d-pud-pmd-_folded.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -From 1071fc5779d9846fec56a4ff6089ab08cac1ab72 Mon Sep 17 00:00:00 2001 -From: Martin Schwidefsky <[email protected]> -Date: Mon, 15 Oct 2018 10:25:57 +0200 -Subject: [PATCH 2/4] mm: introduce mm_[p4d|pud|pmd]_folded - -References: s390/mm: fix mis-accounting of pgtable_bytes -Patch-mainline: v4.20-rc2 -Git-commit: 1071fc5779d9846fec56a4ff6089ab08cac1ab72 - -Add three architecture overrideable functions to test if the -p4d, pud, or pmd layer of a page table is folded or not. - -Acked-by: Kirill A. Shutemov <[email protected]> -Signed-off-by: Martin Schwidefsky <[email protected]> -Acked-by: Michal Suchanek <[email protected]> ---- - include/asm-generic/pgtable.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h -index 88ebc6102c7c..15fd0277ffa6 100644 ---- a/include/asm-generic/pgtable.h -+++ b/include/asm-generic/pgtable.h -@@ -1127,4 +1127,20 @@ static inline bool arch_has_pfn_modify_check(void) - #endif - #endif - -+/* -+ * On some architectures it depends on the mm if the p4d/pud or pmd -+ * layer of the page table hierarchy is folded or not. -+ */ -+#ifndef mm_p4d_folded -+#define mm_p4d_folded(mm) __is_defined(__PAGETABLE_P4D_FOLDED) -+#endif -+ -+#ifndef mm_pud_folded -+#define mm_pud_folded(mm) __is_defined(__PAGETABLE_PUD_FOLDED) -+#endif -+ -+#ifndef mm_pmd_folded -+#define mm_pmd_folded(mm) __is_defined(__PAGETABLE_PMD_FOLDED) -+#endif -+ - #endif /* _ASM_GENERIC_PGTABLE_H */ --- -2.19.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/mm-make-the-__PAGETABLE_PxD_FOLDED-defines-non-empty.patch new/patches.suse/mm-make-the-__PAGETABLE_PxD_FOLDED-defines-non-empty.patch --- old/patches.suse/mm-make-the-__PAGETABLE_PxD_FOLDED-defines-non-empty.patch 2018-12-20 17:42:38.000000000 +0100 +++ new/patches.suse/mm-make-the-__PAGETABLE_PxD_FOLDED-defines-non-empty.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,183 +0,0 @@ -From a8874e7e8a8896f2b6c641f4b8e2473eafd35204 Mon Sep 17 00:00:00 2001 -From: Martin Schwidefsky <[email protected]> -Date: Wed, 31 Oct 2018 12:11:48 +0100 -Subject: [PATCH 1/4] mm: make the __PAGETABLE_PxD_FOLDED defines non-empty - -References: s390/mm: fix mis-accounting of pgtable_bytes -Patch-mainline: v4.20-rc2 -Git-commit: a8874e7e8a8896f2b6c641f4b8e2473eafd35204 - -Change the currently empty defines for __PAGETABLE_PMD_FOLDED, -__PAGETABLE_PUD_FOLDED and __PAGETABLE_P4D_FOLDED to return 1. -This makes it possible to use __is_defined() to test if the -preprocessor define exists. - -Acked-by: Kirill A. Shutemov <[email protected]> -Signed-off-by: Martin Schwidefsky <[email protected]> -Acked-by: Michal Suchanek <[email protected]> ---- - arch/arm/include/asm/pgtable-2level.h | 2 +- - arch/m68k/include/asm/pgtable_mm.h | 4 ++-- - arch/microblaze/include/asm/pgtable.h | 2 +- - arch/nds32/include/asm/pgtable.h | 2 +- - arch/parisc/include/asm/pgtable.h | 2 +- - include/asm-generic/4level-fixup.h | 2 +- - include/asm-generic/5level-fixup.h | 2 +- - include/asm-generic/pgtable-nop4d-hack.h | 2 +- - include/asm-generic/pgtable-nop4d.h | 2 +- - include/asm-generic/pgtable-nopmd.h | 2 +- - include/asm-generic/pgtable-nopud.h | 2 +- - 11 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h -index 92fd2c8a9af0..12659ce5c1f3 100644 ---- a/arch/arm/include/asm/pgtable-2level.h -+++ b/arch/arm/include/asm/pgtable-2level.h -@@ -10,7 +10,7 @@ - #ifndef _ASM_PGTABLE_2LEVEL_H - #define _ASM_PGTABLE_2LEVEL_H - --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - - /* - * Hardware-wise, we have a two level page table structure, where the first -diff --git a/arch/m68k/include/asm/pgtable_mm.h b/arch/m68k/include/asm/pgtable_mm.h -index 6181e4134483..fe3ddd73a0cc 100644 ---- a/arch/m68k/include/asm/pgtable_mm.h -+++ b/arch/m68k/include/asm/pgtable_mm.h -@@ -55,12 +55,12 @@ - */ - #ifdef CONFIG_SUN3 - #define PTRS_PER_PTE 16 --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - #define PTRS_PER_PMD 1 - #define PTRS_PER_PGD 2048 - #elif defined(CONFIG_COLDFIRE) - #define PTRS_PER_PTE 512 --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - #define PTRS_PER_PMD 1 - #define PTRS_PER_PGD 1024 - #else -diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h -index f64ebb9c9a41..e14b6621c933 100644 ---- a/arch/microblaze/include/asm/pgtable.h -+++ b/arch/microblaze/include/asm/pgtable.h -@@ -63,7 +63,7 @@ extern int mem_init_done; - - #include <asm-generic/4level-fixup.h> - --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - - #ifdef __KERNEL__ - #ifndef __ASSEMBLY__ -diff --git a/arch/nds32/include/asm/pgtable.h b/arch/nds32/include/asm/pgtable.h -index d3e19a55cf53..9f52db930c00 100644 ---- a/arch/nds32/include/asm/pgtable.h -+++ b/arch/nds32/include/asm/pgtable.h -@@ -4,7 +4,7 @@ - #ifndef _ASMNDS32_PGTABLE_H - #define _ASMNDS32_PGTABLE_H - --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - #include <asm-generic/4level-fixup.h> - #include <asm-generic/sizes.h> - -diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h -index b941ac7d4e70..c7bb74e22436 100644 ---- a/arch/parisc/include/asm/pgtable.h -+++ b/arch/parisc/include/asm/pgtable.h -@@ -111,7 +111,7 @@ static inline void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) - #if CONFIG_PGTABLE_LEVELS == 3 - #define BITS_PER_PMD (PAGE_SHIFT + PMD_ORDER - BITS_PER_PMD_ENTRY) - #else --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - #define BITS_PER_PMD 0 - #endif - #define PTRS_PER_PMD (1UL << BITS_PER_PMD) -diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h -index 89f3b03b1445..e3667c9a33a5 100644 ---- a/include/asm-generic/4level-fixup.h -+++ b/include/asm-generic/4level-fixup.h -@@ -3,7 +3,7 @@ - #define _4LEVEL_FIXUP_H - - #define __ARCH_HAS_4LEVEL_HACK --#define __PAGETABLE_PUD_FOLDED -+#define __PAGETABLE_PUD_FOLDED 1 - - #define PUD_SHIFT PGDIR_SHIFT - #define PUD_SIZE PGDIR_SIZE -diff --git a/include/asm-generic/5level-fixup.h b/include/asm-generic/5level-fixup.h -index 9c2e0708eb82..73474bb52344 100644 ---- a/include/asm-generic/5level-fixup.h -+++ b/include/asm-generic/5level-fixup.h -@@ -3,7 +3,7 @@ - #define _5LEVEL_FIXUP_H - - #define __ARCH_HAS_5LEVEL_HACK --#define __PAGETABLE_P4D_FOLDED -+#define __PAGETABLE_P4D_FOLDED 1 - - #define P4D_SHIFT PGDIR_SHIFT - #define P4D_SIZE PGDIR_SIZE -diff --git a/include/asm-generic/pgtable-nop4d-hack.h b/include/asm-generic/pgtable-nop4d-hack.h -index 0c34215263b8..1d6dd38c0e5e 100644 ---- a/include/asm-generic/pgtable-nop4d-hack.h -+++ b/include/asm-generic/pgtable-nop4d-hack.h -@@ -5,7 +5,7 @@ - #ifndef __ASSEMBLY__ - #include <asm-generic/5level-fixup.h> - --#define __PAGETABLE_PUD_FOLDED -+#define __PAGETABLE_PUD_FOLDED 1 - - /* - * Having the pud type consist of a pgd gets the size right, and allows -diff --git a/include/asm-generic/pgtable-nop4d.h b/include/asm-generic/pgtable-nop4d.h -index 1a29b2a0282b..04cb913797bc 100644 ---- a/include/asm-generic/pgtable-nop4d.h -+++ b/include/asm-generic/pgtable-nop4d.h -@@ -4,7 +4,7 @@ - - #ifndef __ASSEMBLY__ - --#define __PAGETABLE_P4D_FOLDED -+#define __PAGETABLE_P4D_FOLDED 1 - - typedef struct { pgd_t pgd; } p4d_t; - -diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h -index f35f6e8149e4..b85b8271a73d 100644 ---- a/include/asm-generic/pgtable-nopmd.h -+++ b/include/asm-generic/pgtable-nopmd.h -@@ -8,7 +8,7 @@ - - struct mm_struct; - --#define __PAGETABLE_PMD_FOLDED -+#define __PAGETABLE_PMD_FOLDED 1 - - /* - * Having the pmd type consist of a pud gets the size right, and allows -diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h -index e950b9c50f34..9bef475db6fe 100644 ---- a/include/asm-generic/pgtable-nopud.h -+++ b/include/asm-generic/pgtable-nopud.h -@@ -9,7 +9,7 @@ - #else - #include <asm-generic/pgtable-nop4d.h> - --#define __PAGETABLE_PUD_FOLDED -+#define __PAGETABLE_PUD_FOLDED 1 - - /* - * Having the pud type consist of a p4d gets the size right, and allows --- -2.19.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/packet-validate-address-length-if-non-zero.patch new/patches.suse/packet-validate-address-length-if-non-zero.patch --- old/patches.suse/packet-validate-address-length-if-non-zero.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/packet-validate-address-length-if-non-zero.patch 2019-01-08 09:38:29.000000000 +0100 @@ -0,0 +1,44 @@ +From: Willem de Bruijn <[email protected]> +Date: Sat, 22 Dec 2018 16:53:45 -0500 +Subject: packet: validate address length if non-zero +Git-commit: 6b8d95f1795c42161dc0984b6863e95d6acf24ed +Patch-mainline: v5.0-rc1 +References: nmap EINVAL failure + +Validate packet socket address length if a length is given. Zero +length is equivalent to not setting an address. + +Fixes: 99137b7888f4 ("packet: validate address length") +Reported-by: Ido Schimmel <[email protected]> +Signed-off-by: Willem de Bruijn <[email protected]> +Signed-off-by: David S. Miller <[email protected]> +Signed-off-by: Jiri Slaby <[email protected]> +--- + net/packet/af_packet.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c +index 5dda263b4a0a..eedacdebcd4c 100644 +--- a/net/packet/af_packet.c ++++ b/net/packet/af_packet.c +@@ -2625,7 +2625,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) + sll_addr))) + goto out; + proto = saddr->sll_protocol; +- addr = saddr->sll_addr; ++ addr = saddr->sll_halen ? saddr->sll_addr : NULL; + dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex); + if (addr && dev && saddr->sll_halen < dev->addr_len) + goto out; +@@ -2825,7 +2825,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) + if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr))) + goto out; + proto = saddr->sll_protocol; +- addr = saddr->sll_addr; ++ addr = saddr->sll_halen ? saddr->sll_addr : NULL; + dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex); + if (addr && dev && saddr->sll_halen < dev->addr_len) + goto out; +-- +2.20.1 + ++++++ series.conf ++++++ ++++ 1462 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new.28833/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.15WJKr/_old 2019-01-15 09:09:28.294618805 +0100 +++ /var/tmp/diff_new_pack.15WJKr/_new 2019-01-15 09:09:28.298618801 +0100 @@ -1,3 +1,3 @@ -2018-12-22 08:59:36 +0000 -GIT Revision: c634493cc649767a69445e492031b9c1e93364fb +2019-01-08 08:38:29 +0000 +GIT Revision: 34f009a915d109328e0960dd99d877df9b22af78 GIT Branch: stable
