Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at 2017-06-17 10:18:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Sat Jun 17 10:18:35 2017 rev:368 rq:503710 version:4.11.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
2017-06-12 15:12:00.081313592 +0200
+++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes
2017-06-17 10:18:36.688804441 +0200
@@ -1,0 +2,56 @@
+Wed Jun 14 16:24:30 CEST 2017 - jsl...@suse.cz
+
+- Linux 4.11.5 (CVE-2017-1000380 bnc#1012628 bsc#1040041
+ bsc#1044125 CVE-2017-7346 bsc#1031796).
+- Delete
+ patches.fixes/ALSA-timer-Fix-missing-queue-indices-reset-at-SNDRV_.
+- Delete patches.fixes/ALSA-timer-Fix-race-between-read-and-ioctl.
+- Delete
+ patches.fixes/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_.patch.
+- Delete
+ patches.fixes/ptrace-Properly-initialize-ptracer_cred-on-fork.
+- commit 8ffa6bb
+
+-------------------------------------------------------------------
+Tue Jun 13 17:59:49 CEST 2017 - ti...@suse.de
+
+- ALSA: timer: Fix missing queue indices reset at
+ SNDRV_TIMER_IOCTL_SELECT (CVE-2017-1000380,bsc#1044125).
+- ALSA: timer: Fix race between read and ioctl
+ (CVE-2017-1000380,bsc#1044125).
+- commit 94096d3
+
+-------------------------------------------------------------------
+Tue Jun 13 15:51:25 CEST 2017 - mma...@suse.com
+
+- rpm/kernel-module-subpackage: Generate proper supplements in the template
+ ... instead of relying on find-provides.ksyms to do it (bsc#981083).
+- commit b1fe840
+
+-------------------------------------------------------------------
+Mon Jun 12 16:30:47 CEST 2017 - mma...@suse.com
+
+- rpm/kernel-source.spec.in: Do not list deleted depdendency helpers
+ (bsc#981083).
+- commit 9306efe
+
+-------------------------------------------------------------------
+Fri Jun 9 17:20:15 CEST 2017 - mma...@suse.com
+
+- Define dependencies of in-kernel KMPs statically
+ This allows us to use rpm's internal dependency generator (bsc#981083).
+- commit 88d6128
+
+-------------------------------------------------------------------
+Fri Jun 9 17:17:04 CEST 2017 - mma...@suse.com
+
+- rpm/find-provides: Delete, as /boot/vmlinux-* is no longer in -devel
+- commit 4df55cc
+
+-------------------------------------------------------------------
+Fri Jun 9 17:16:22 CEST 2017 - mma...@suse.com
+
+- rpm/package-descriptions: Import SLE12-SP3 KMP descriptions
+- commit ff51a7c
+
+-------------------------------------------------------------------
@@ -44,0 +101,8 @@
+Mon Jun 5 14:54:23 CEST 2017 - msucha...@suse.de
+
+- rpm/kernel-binary.spec: remove superfluous flags
+ This should make build logs more readable and people adding more flags
+ should have easier time finding a place to add them in the spec file.
+- commit 13e40fa
+
+-------------------------------------------------------------------
@@ -56,0 +121,13 @@
+Mon Jun 5 09:17:02 CEST 2017 - msucha...@suse.de
+
+- kernel-binary.spec: Propagate MAKE_ARGS to %build (bsc#1012422)
+- commit 6171b7a
+
+-------------------------------------------------------------------
+Fri Jun 2 11:40:55 CEST 2017 - mma...@suse.com
+
+- rpm/kernel-source.spec.in: Drop patches.{trace,xen}.tar.bz2
+ These are empty in current branches.
+- commit 742f1d0
+
+-------------------------------------------------------------------
@@ -189,0 +267,18 @@
+
+-------------------------------------------------------------------
+Wed May 3 10:48:46 CEST 2017 - msucha...@suse.de
+
+- kernel-binary.spec Remove superfluous [].
+- commit 0bf8e9f
+
+-------------------------------------------------------------------
+Tue May 2 13:23:39 CEST 2017 - msucha...@suse.de
+
+- Use make --output-sync feature when available (bsc#1012422).
+ The mesages in make output can interleave making it impossible to
+ extract warnings reliably. Since version 4 GNU Make supports
+ --output-sync flag that prints output of each sub-command atomically
+ preventing this issue. Detect the flag and use it if available.
+ SLE11 has make 3.81 so it is required to include make 4 in the kernel
+ OBS projects to take advantege of this.
+- commit 8c2f46d
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-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-syzkaller.changes: same change
kernel-vanilla.changes: same change
Old:
----
find-provides
find-requires
patches.trace.tar.bz2
patches.xen.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:41.872073278 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:41.876072714 +0200
@@ -17,7 +17,7 @@
%define srcversion 4.11
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -26,12 +26,12 @@
%define dtc_symbols 1
%endif
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb})
+%(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})
Name: dtb-aarch64
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
@@ -69,8 +69,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -105,12 +103,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
@@ -334,7 +330,7 @@
%prep
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107
-a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108
-a 109 -a 110 -a 111 -a 113 -a 120 -a 121
cd linux-%srcversion
%_sourcedir/apply-patches %_sourcedir/series.conf ..
dtb-armv6l.spec: same change
dtb-armv7l.spec: same change
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:41.976058610 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:41.984057481 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.11
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%define vanilla_only 0
@@ -37,7 +37,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb})
+%(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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -58,9 +58,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0
Group: System/Kernel
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
@@ -175,8 +175,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -211,12 +209,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
@@ -256,8 +252,6 @@
NoSource: 38
NoSource: 39
NoSource: 40
-NoSource: 44
-NoSource: 45
NoSource: 46
NoSource: 47
NoSource: 48
@@ -292,12 +286,10 @@
NoSource: 104
NoSource: 105
NoSource: 106
-NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
-NoSource: 112
NoSource: 113
NoSource: 120
NoSource: 121
@@ -356,13 +348,6 @@
# TW 4.8
%obsolete_kmp ftsteutates 20160601
-# Provide the exported symbols as "ksym(symbol) = hash"
-%define _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %name
-
-# Generate dependencies for KMPs defined in supported.conf
-%define __find_requires %_sourcedir/find-requires %name %version-%release
%my_builddir
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -388,7 +373,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107
-a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108
-a 109 -a 110 -a 111 -a 113 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -473,12 +458,21 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD"
+makeoutputsync=
+if make --output-sync --help >/dev/null 2>&1 ; then
+ makeoutputsync=--output-sync
+else
+ echo make does not support --output-sync flag. Build messages may be
mangled. 1>&2
+fi
+MAKE_ARGS="$MAKE_ARGS $makeoutputsync %{?_smp_mflags}"
+echo export MAKE_ARGS=\""$MAKE_ARGS"\" >> .kernel-binary.spec.buildenv
+
+KERN_DIRS="-C .. O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
- yes '' | make oldconfig $MAKE_ARGS
+ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS < /dev/null
+ make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
@@ -519,8 +513,6 @@
cat "$f" >>certs/signing_key.pem
done
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"
-
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.096041685 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.096041685 +0200
@@ -16,7 +16,7 @@
#
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -42,9 +42,9 @@
Summary: Kernel Documentation (man pages)
License: GPL-2.0
Group: Documentation/Man
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
++++++ kernel-lpae.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.124037736 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.128037172 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.11
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%define vanilla_only 0
@@ -37,7 +37,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb})
+%(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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -58,9 +58,9 @@
Summary: Kernel for LPAE enabled systems
License: GPL-2.0
Group: System/Kernel
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
@@ -175,8 +175,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -211,12 +209,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
@@ -256,8 +252,6 @@
NoSource: 38
NoSource: 39
NoSource: 40
-NoSource: 44
-NoSource: 45
NoSource: 46
NoSource: 47
NoSource: 48
@@ -292,12 +286,10 @@
NoSource: 104
NoSource: 105
NoSource: 106
-NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
-NoSource: 112
NoSource: 113
NoSource: 120
NoSource: 121
@@ -356,13 +348,6 @@
# TW 4.8
%obsolete_kmp ftsteutates 20160601
-# Provide the exported symbols as "ksym(symbol) = hash"
-%define _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %name
-
-# Generate dependencies for KMPs defined in supported.conf
-%define __find_requires %_sourcedir/find-requires %name %version-%release
%my_builddir
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -386,7 +371,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107
-a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108
-a 109 -a 110 -a 111 -a 113 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -471,12 +456,21 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD"
+makeoutputsync=
+if make --output-sync --help >/dev/null 2>&1 ; then
+ makeoutputsync=--output-sync
+else
+ echo make does not support --output-sync flag. Build messages may be
mangled. 1>&2
+fi
+MAKE_ARGS="$MAKE_ARGS $makeoutputsync %{?_smp_mflags}"
+echo export MAKE_ARGS=\""$MAKE_ARGS"\" >> .kernel-binary.spec.buildenv
+
+KERN_DIRS="-C .. O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
- yes '' | make oldconfig $MAKE_ARGS
+ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS < /dev/null
+ make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
@@ -517,8 +511,6 @@
cat "$f" >>certs/signing_key.pem
done
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"
-
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.156033222 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.160032658 +0200
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%define vanilla_only 0
@@ -57,9 +57,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0
Group: SLES
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.184029273 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.192028145 +0200
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%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.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.224023631 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.224023631 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.11
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%define vanilla_only 0
@@ -37,7 +37,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb})
+%(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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -58,9 +58,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0
Group: System/Kernel
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
@@ -197,8 +197,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -233,12 +231,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
@@ -278,8 +274,6 @@
NoSource: 38
NoSource: 39
NoSource: 40
-NoSource: 44
-NoSource: 45
NoSource: 46
NoSource: 47
NoSource: 48
@@ -314,12 +308,10 @@
NoSource: 104
NoSource: 105
NoSource: 106
-NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
-NoSource: 112
NoSource: 113
NoSource: 120
NoSource: 121
@@ -378,13 +370,6 @@
# TW 4.8
%obsolete_kmp ftsteutates 20160601
-# Provide the exported symbols as "ksym(symbol) = hash"
-%define _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %name
-
-# Generate dependencies for KMPs defined in supported.conf
-%define __find_requires %_sourcedir/find-requires %name %version-%release
%my_builddir
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -414,7 +399,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107
-a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108
-a 109 -a 110 -a 111 -a 113 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -499,12 +484,21 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD"
+makeoutputsync=
+if make --output-sync --help >/dev/null 2>&1 ; then
+ makeoutputsync=--output-sync
+else
+ echo make does not support --output-sync flag. Build messages may be
mangled. 1>&2
+fi
+MAKE_ARGS="$MAKE_ARGS $makeoutputsync %{?_smp_mflags}"
+echo export MAKE_ARGS=\""$MAKE_ARGS"\" >> .kernel-binary.spec.buildenv
+
+KERN_DIRS="-C .. O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
- yes '' | make oldconfig $MAKE_ARGS
+ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS < /dev/null
+ make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
@@ -545,8 +539,6 @@
cat "$f" >>certs/signing_key.pem
done
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"
-
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.264017990 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.268017426 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.11
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%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.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
@@ -66,8 +66,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -102,12 +100,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
@@ -118,7 +114,7 @@
Requires: kernel-devel%variant = %version-%release
Recommends: openssl-devel
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb})
+%(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})
%define symbols %(set -- $([ -e %_sourcedir/extra-symbols ] && cat
%_sourcedir/extra-symbols) ; echo $*)
%define variant_symbols %(case %name in (*-rt) echo "RT" ;; esac)
@@ -174,7 +170,7 @@
echo "Symbol(s): %symbols"
# Unpack all sources and patches
-%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108
-a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108 -a 109
-a 110 -a 111 -a 113 -a 120 -a 121
%build
mkdir -p $RPM_BUILD_ROOT/usr/src
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.300012912 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.300012912 +0200
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0
Group: Development/Sources
-Version: 4.11.4
+Version: 4.11.5
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
++++++ kernel-syzkaller.spec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.340007270 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.344006706 +0200
@@ -18,7 +18,7 @@
%define srcversion 4.11
-%define patchversion 4.11.4
+%define patchversion 4.11.5
%define variant %{nil}
%define vanilla_only 0
@@ -37,7 +37,7 @@
%define rpm_install_dir %buildroot%obj_install_dir
%define kernel_build_dir %my_builddir/linux-%srcversion/linux-obj
-%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,find-provides,find-requires,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb})
+%(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})
%global cpu_arch %(%_sourcedir/arch-symbols %_target_cpu)
%define cpu_arch_flavor %cpu_arch/%build_flavor
@@ -58,9 +58,9 @@
Summary: Kernel used for fuzzing by syzkaller
License: GPL-2.0
Group: System/Kernel
-Version: 4.11.4
+Version: 4.11.5
%if 0%{?is_kotd}
-Release: <RELEASE>.gcba98ee
+Release: <RELEASE>.g8ffa6bb
%else
Release: 0
%endif
@@ -175,8 +175,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -211,12 +209,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
@@ -256,8 +252,6 @@
NoSource: 38
NoSource: 39
NoSource: 40
-NoSource: 44
-NoSource: 45
NoSource: 46
NoSource: 47
NoSource: 48
@@ -292,12 +286,10 @@
NoSource: 104
NoSource: 105
NoSource: 106
-NoSource: 107
NoSource: 108
NoSource: 109
NoSource: 110
NoSource: 111
-NoSource: 112
NoSource: 113
NoSource: 120
NoSource: 121
@@ -356,13 +348,6 @@
# TW 4.8
%obsolete_kmp ftsteutates 20160601
-# Provide the exported symbols as "ksym(symbol) = hash"
-%define _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %name
-
-# Generate dependencies for KMPs defined in supported.conf
-%define __find_requires %_sourcedir/find-requires %name %version-%release
%my_builddir
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -387,7 +372,7 @@
fi
# Unpack all sources and patches
-%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107
-a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 120 -a 121
+%setup -q -c -T -a 0 -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 108
-a 109 -a 110 -a 111 -a 113 -a 120 -a 121
mkdir -p %kernel_build_dir
@@ -472,12 +457,21 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD"
+makeoutputsync=
+if make --output-sync --help >/dev/null 2>&1 ; then
+ makeoutputsync=--output-sync
+else
+ echo make does not support --output-sync flag. Build messages may be
mangled. 1>&2
+fi
+MAKE_ARGS="$MAKE_ARGS $makeoutputsync %{?_smp_mflags}"
+echo export MAKE_ARGS=\""$MAKE_ARGS"\" >> .kernel-binary.spec.buildenv
+
+KERN_DIRS="-C .. O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
- yes '' | make oldconfig $MAKE_ARGS
+ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS < /dev/null
+ make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
@@ -518,8 +512,6 @@
cat "$f" >>certs/signing_key.pem
done
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"
-
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
kernel-vanilla.spec: same change
++++++ kernel-binary.spec.in ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.807941263 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.811940699 +0200
@@ -228,13 +228,6 @@
# TW 4.8
%obsolete_kmp ftsteutates 20160601
-# Provide the exported symbols as "ksym(symbol) = hash"
-%define _use_internal_dependency_generator 0
-%define __find_provides %_sourcedir/find-provides %name
-
-# Generate dependencies for KMPs defined in supported.conf
-%define __find_requires %_sourcedir/find-requires %name %version-%release
%my_builddir
-
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
@@ -342,12 +335,21 @@
--disable CONFIG_DEBUG_INFO
%endif
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags} -C .. O=$PWD"
+makeoutputsync=
+if make --output-sync --help >/dev/null 2>&1 ; then
+ makeoutputsync=--output-sync
+else
+ echo make does not support --output-sync flag. Build messages may be
mangled. 1>&2
+fi
+MAKE_ARGS="$MAKE_ARGS $makeoutputsync %{?_smp_mflags}"
+echo export MAKE_ARGS=\""$MAKE_ARGS"\" >> .kernel-binary.spec.buildenv
+
+KERN_DIRS="-C .. O=$PWD"
if test -e %_sourcedir/TOLERATE-UNKNOWN-NEW-CONFIG-OPTIONS; then
- yes '' | make oldconfig $MAKE_ARGS
+ yes '' | make oldconfig $MAKE_ARGS $KERN_DIRS
else
cp .config .config.orig
- make silentoldconfig $MAKE_ARGS < /dev/null
+ make silentoldconfig $MAKE_ARGS $KERN_DIRS < /dev/null
%_sourcedir/check-for-config-changes .config.orig .config
rm .config.orig
fi
@@ -388,8 +390,6 @@
cat "$f" >>certs/signing_key.pem
done
-MAKE_ARGS="$MAKE_ARGS %{?_smp_mflags}"
-
%if %CONFIG_KMSG_IDS == "y"
chmod +x ../scripts/kmsg-doc
MAKE_ARGS="$MAKE_ARGS D=2"
@@ -988,6 +988,7 @@
# tell weak-modules2 to ignore this package
Provides: kmp_in_kernel
Requires(post): suse-module-tools >= 12.4
+@KMP_DEPS@
%description -n @KMP_NAME@-%build_flavor
@KMP_DESCRIPTION@
++++++ kernel-module-subpackage ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.887929979 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.887929979 +0200
@@ -26,6 +26,7 @@
Requires: coreutils grep
%{-c:Requires: %{-n*}-ueficert}
Enhances: kernel-%1
+Supplements: packageand(kernel-%1:%{-n*})
%if "%1" == "default"
Obsoletes: %{-n*}-kmp-trace
%ifarch %ix86
++++++ kernel-source.spec.in ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:42.983916439 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:42.983916439 +0200
@@ -66,8 +66,6 @@
Source38: README.KSYMS
Source39: config-options.changes.txt
Source40: source-timestamp
-Source44: find-provides
-Source45: find-requires
Source46: split-modules
Source47: modversions
Source48: macros.kernel-source
@@ -102,12 +100,10 @@
Source104: patches.fixes.tar.bz2
Source105: patches.rpmify.tar.bz2
Source106: patches.suse.tar.bz2
-Source107: patches.xen.tar.bz2
Source108: patches.addon.tar.bz2
Source109: patches.kernel.org.tar.bz2
Source110: patches.apparmor.tar.bz2
Source111: patches.rt.tar.bz2
-Source112: patches.trace.tar.bz2
Source113: patches.kabi.tar.bz2
Source120: kabi.tar.bz2
Source121: sysctl.tar.bz2
++++++ mkspec ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:43.083902335 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:43.087901771 +0200
@@ -34,7 +34,7 @@
$rpmrelease = $vars{'RELEASE'} || 0;
}
-# package name -> [summary, description]
+# package name -> [summary, description, extra kmp deps]
my %binary_descriptions = parse_descriptions();
# arch -> flavor -> [obsoleted packages]
@@ -96,20 +96,23 @@
my $kmp_definitions = "";
my @kmp_definitions;
for my $kmp (@kmps) {
- my ($summary, $description);
+ my ($summary, $description, $deps);
if (!exists($binary_descriptions{$kmp})) {
print STDERR "warning: no description for $kmp found\n";
($summary = $kmp) =~ s/-kmp$//;
$summary .= " kernel modules";
$description = "$summary.";
+ $deps = "";
} else {
$summary = $binary_descriptions{$kmp}->[0];
$description = $binary_descriptions{$kmp}->[1];
+ $deps = $binary_descriptions{$kmp}->[2];
}
push(@kmp_definitions, expand_template("kmp",
KMP_NAME => $kmp,
KMP_SUMMARY => $summary,
- KMP_DESCRIPTION => $description));
+ KMP_DESCRIPTION => $description,
+ KMP_DEPS => $deps));
}
$kmp_definitions = join("\n", @kmp_definitions);
@@ -301,13 +304,15 @@
if ($current) {
chomp $current->[1];
}
- $current = ["", ""];
+ $current = ["", "", ""];
$res{$package} = $current;
$state = 0;
next;
}
if (/^$/) {
- if ($state == 2) {
+ if ($state == 0) {
+ $state++;
+ } elsif ($state == 2) {
$blank .= $_;
}
next;
@@ -315,12 +320,27 @@
# non-blank line and not === package ===
if ($state == 0) {
chomp;
- $current->[0] = $_;
- $state = 1;
+ if (s/^Requires: *//) {
+ # foo-kmp is a shorthand for another kmp
+ # from the same specfile
+ s/-kmp/-kmp-%build_flavor = %version-%release/g;
+ s/^/Requires: /;
+ if ($current->[2]) {
+ $current->[2] .= "\n";
+ }
+ $current->[2] .= $_;
+ } else {
+ # The Summary: keyword is optional
+ s/^Summary: *//;
+ if ($current->[0]) {
+ print STDERR "warning: multi-line
summary\n";
+ }
+ $current->[0] = $_;
+ }
} elsif ($state == 1) {
$current->[1] = $_;
$blank = "";
- $state = 2;
+ $state++;
} else {
$current->[1] .= $blank;
$blank = "";
++++++ package-descriptions ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:43.167890488 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:43.171889923 +0200
@@ -1,13 +1,15 @@
# Descriptions of the binary kernel packages. The format is
#
# === <package name> ===
-# Summary (single line)
+# Summary: Package summary (single line)
+# Requires: additional dependencies for KMPs (single line)
+# ...
#
# Long description (multiple
# lines)
#
# Descriptions of the -base and -extra subpackages are derived from the
-# main descriptions.
+# main descriptions. The "Summary:" keyword can be omitted
=== kernel-debug ===
A Debug Version of the Kernel
@@ -98,3 +100,29 @@
This kernel should only be used by the s390-tools package. This kernel
should not be installed as a regular booting kernel.
+=== cluster-md-kmp ===
+Summary: Clustering support for MD devices
+Requires: dlm-kmp
+
+Clustering support for MD devices. This enables locking and
+synchronization across multiple systems on the cluster, so all
+nodes in the cluster can access the MD devices simultaneously.
+
+=== dlm-kmp ===
+DLM kernel modules
+
+DLM stands for Distributed Lock Manager, a means to synchronize access to
+shared resources over the cluster.
+
+=== gfs2-kmp ===
+Summary: GFS2 kernel modules
+Requires: dlm-kmp
+
+GFS2 is Global Filesystem, a shared device filesystem.
+
+=== ocfs2-kmp ===
+Summary: OCFS2 kernel modules
+Requires: dlm-kmp
+
+OCFS2 is the Oracle Cluster Filesystem, a filesystem for shared devices
+accessible simultaneously from multiple nodes of a cluster.
++++++ patches.fixes.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_.patch
new/patches.fixes/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_.patch
---
old/patches.fixes/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_.patch
2017-06-07 17:14:28.000000000 +0200
+++
new/patches.fixes/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-From 032018df0351f6d3f138d1e7ebcd95bebc47828c Mon Sep 17 00:00:00 2001
-From: Vladis Dronov <vdro...@redhat.com>
-Date: Fri, 2 Jun 2017 07:42:09 +0200
-Subject: [PATCH] drm/vmwgfx: limit the number of mip levels in
- vmw_gb_surface_define_ioctl()
-
-Git-commit: b3853a7a95888646e1246f85625477c50084e1f4
-Git-repo: git://people.freedesktop.org/~thomash/linux
-Patch-mainline: Queued in subsystem maintainer repository
-References: CVE-2017-7346 bsc#1031796
-
-The 'req->mip_levels' parameter in vmw_gb_surface_define_ioctl() is
-a user-controlled 'uint32_t' value which is used as a loop count limit.
-This can lead to a kernel lockup and DoS. Add check for 'req->mip_levels'.
-
-References: https://bugzilla.redhat.com/show_bug.cgi?id=1437431
-
-Cc: <sta...@vger.kernel.org>
-Signed-off-by: Vladis Dronov <vdro...@redhat.com>
-Reviewed-by: Sinclair Yeh <s...@vmware.com>
-Signed-off-by: Patrik Jakobsson <pjakobs...@suse.de>
----
- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
-index 05fa092c942b..6fed5a8da005 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
-@@ -1280,6 +1280,9 @@ int vmw_gb_surface_define_ioctl(struct drm_device *dev,
void *data,
- if (req->multisample_count != 0)
- return -EINVAL;
-
-+ if (req->mip_levels > DRM_VMW_MAX_MIP_LEVELS)
-+ return -EINVAL;
-+
- if (unlikely(vmw_user_surface_size == 0))
- vmw_user_surface_size = ttm_round_pot(sizeof(*user_srf)) +
- 128;
---
-2.13.0
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.fixes/ptrace-Properly-initialize-ptracer_cred-on-fork
new/patches.fixes/ptrace-Properly-initialize-ptracer_cred-on-fork
--- old/patches.fixes/ptrace-Properly-initialize-ptracer_cred-on-fork
2017-06-07 17:14:28.000000000 +0200
+++ new/patches.fixes/ptrace-Properly-initialize-ptracer_cred-on-fork
1970-01-01 01:00:00.000000000 +0100
@@ -1,114 +0,0 @@
-From: "Eric W. Biederman" <ebied...@xmission.com>
-Date: Mon, 22 May 2017 16:04:48 -0500
-Subject: [PATCH] ptrace: Properly initialize ptracer_cred on fork
-Message-ID: <877f18txfz.fsf...@xmission.com>
-Patch-mainline: 4.12-rc3
-Git-commit: c70d9d809fdeecedb96972457ee45c49a232d97f
-References: bsc#1040041
-
-When I introduced ptracer_cred I failed to consider the weirdness of
-fork where the task_struct copies the old value by default. This
-winds up leaving ptracer_cred set even when a process forks and
-the child process does not wind up being ptraced.
-
-Because ptracer_cred is not set on non-ptraced processes whose
-parents were ptraced this has broken the ability of the enlightenment
-window manager to start setuid children.
-
-Fix this by properly initializing ptracer_cred in ptrace_init_task
-
-This must be done with a little bit of care to preserve the current value
-of ptracer_cred when ptrace carries through fork. Re-reading the
-ptracer_cred from the ptracing process at this point is inconsistent
-with how PT_PTRACE_CAP has been maintained all of these years.
-
-Fixes: 64b875f7ac8a ("ptrace: Capture the ptracer's creds not PT_PTRACE_CAP")
-Signed-off-by: "Eric W. Biederman" <ebied...@xmission.com>
-Signed-off-by: Takashi Iwai <ti...@suse.de>
-
----
- include/linux/ptrace.h | 7 +++++--
- kernel/ptrace.c | 20 +++++++++++++-------
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
---- a/include/linux/ptrace.h
-+++ b/include/linux/ptrace.h
-@@ -54,7 +54,8 @@ extern int ptrace_request(struct task_st
- unsigned long addr, unsigned long data);
- extern void ptrace_notify(int exit_code);
- extern void __ptrace_link(struct task_struct *child,
-- struct task_struct *new_parent);
-+ struct task_struct *new_parent,
-+ const struct cred *ptracer_cred);
- extern void __ptrace_unlink(struct task_struct *child);
- extern void exit_ptrace(struct task_struct *tracer, struct list_head *dead);
- #define PTRACE_MODE_READ 0x01
-@@ -206,7 +207,7 @@ static inline void ptrace_init_task(stru
-
- if (unlikely(ptrace) && current->ptrace) {
- child->ptrace = current->ptrace;
-- __ptrace_link(child, current->parent);
-+ __ptrace_link(child, current->parent, current->ptracer_cred);
-
- if (child->ptrace & PT_SEIZED)
- task_set_jobctl_pending(child, JOBCTL_TRAP_STOP);
-@@ -215,6 +216,8 @@ static inline void ptrace_init_task(stru
-
- set_tsk_thread_flag(child, TIF_SIGPENDING);
- }
-+ else
-+ child->ptracer_cred = NULL;
- }
-
- /**
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -60,19 +60,25 @@ int ptrace_access_vm(struct task_struct
- }
-
-
-+void __ptrace_link(struct task_struct *child, struct task_struct *new_parent,
-+ const struct cred *ptracer_cred)
-+{
-+ BUG_ON(!list_empty(&child->ptrace_entry));
-+ list_add(&child->ptrace_entry, &new_parent->ptraced);
-+ child->parent = new_parent;
-+ child->ptracer_cred = get_cred(ptracer_cred);
-+}
-+
- /*
- * ptrace a task: make the debugger its new parent and
- * move it to the ptrace list.
- *
- * Must be called with the tasklist lock write-held.
- */
--void __ptrace_link(struct task_struct *child, struct task_struct *new_parent)
-+static void ptrace_link(struct task_struct *child, struct task_struct
*new_parent)
- {
-- BUG_ON(!list_empty(&child->ptrace_entry));
-- list_add(&child->ptrace_entry, &new_parent->ptraced);
-- child->parent = new_parent;
- rcu_read_lock();
-- child->ptracer_cred = get_cred(__task_cred(new_parent));
-+ __ptrace_link(child, new_parent, __task_cred(new_parent));
- rcu_read_unlock();
- }
-
-@@ -386,7 +392,7 @@ static int ptrace_attach(struct task_str
- flags |= PT_SEIZED;
- task->ptrace = flags;
-
-- __ptrace_link(task, current);
-+ ptrace_link(task, current);
-
- /* SEIZE doesn't trap tracee on attach */
- if (!seize)
-@@ -459,7 +465,7 @@ static int ptrace_traceme(void)
- */
- if (!ret && !(current->real_parent->flags & PF_EXITING)) {
- current->ptrace = PT_PTRACED;
-- __ptrace_link(current, current->real_parent);
-+ ptrace_link(current, current->real_parent);
- }
- }
- write_unlock_irq(&tasklist_lock);
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 5402 lines of diff (skipped)
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:43.515841405 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:43.519840841 +0200
@@ -31,6 +31,7 @@
patches.kernel.org/patch-4.11.1-2
patches.kernel.org/patch-4.11.2-3
patches.kernel.org/patch-4.11.3-4
+ patches.kernel.org/patch-4.11.4-5
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -326,7 +327,6 @@
########################################################
patches.fixes/drm-i915-Fix-S4-resume-breakage
patches.fixes/drm-amdgpu-revert-update-tile-table-for-oland-hainan.patch
- patches.fixes/drm-vmwgfx-limit-the-number-of-mip-levels-in-vmw_gb_.patch
########################################################
# video4linux
@@ -450,7 +450,6 @@
# Security stuff
#
##########################################################
- patches.fixes/ptrace-Properly-initialize-ptracer_cred-on-fork
##########################################################
# Audit
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.BpNTr7/_old 2017-06-17 10:18:43.555835763 +0200
+++ /var/tmp/diff_new_pack.BpNTr7/_new 2017-06-17 10:18:43.559835199 +0200
@@ -1,3 +1,3 @@
-2017-06-07 17:14:28 +0200
-GIT Revision: cba98eed4de5d08a98e0b0fa4717778762020d36
+2017-06-14 16:24:30 +0200
+GIT Revision: 8ffa6bb37a7fdc4006970d6e2d409281ea416865
GIT Branch: stable
