Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2017-09-12 19:40:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source" Tue Sep 12 19:40:06 2017 rev:378 rq:522884 version:4.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2017-09-07 22:07:10.630029551 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2017-09-12 19:40:07.771853351 +0200 @@ -1,0 +2,29 @@ +Sun Sep 10 09:41:36 CEST 2017 - [email protected] + +- rpm/constraints.in: set physical memory + Not memory. +- rpm/constraints.in: increase memory for kernel-syzkaller + And see if it helps. If so, push it to packaging... +- commit 0d725b5 + +------------------------------------------------------------------- +Sun Sep 10 08:45:43 CEST 2017 - [email protected] + +- Linux 4.13.1 (bnc#1012628). +- commit 847b81f + +------------------------------------------------------------------- +Fri Sep 8 13:19:18 CEST 2017 - [email protected] + +- rpm/kernel-binary.spec.in: package ftrace-mod.o on arm64 + It is needed for building modules since 4.13: + CC [M] /suse/jslaby/a/aaa.o + Building modules, stage 2. + MODPOST 1 modules + CC /suse/jslaby/a/aaa.mod.o + LD [M] /suse/jslaby/a/aaa.ko + ld: cannot find ./arch/arm64/kernel/ftrace-mod.o: No such file or directory + ... +- commit 07da115 + +------------------------------------------------------------------- @@ -7,0 +37,6 @@ +Tue Sep 5 20:41:12 CEST 2017 - [email protected] + +- Update to 4.13-final. +- commit 3fdcb17 + +------------------------------------------------------------------- @@ -12 +47,8 @@ -- commit d79ffeb +- commit 8116757 + +------------------------------------------------------------------- +Thu Aug 31 16:24:01 CEST 2017 - [email protected] + +- Update to 4.13-rc7. +- Eliminate 2 patches. +- commit dd00417 @@ -21,0 +64,7 @@ +Thu Aug 31 15:32:51 CEST 2017 - [email protected] + +- scsi: qla2xxx: Fix an integer overflow in sysfs code + (bsc#1056588, CVE-2017-14051). +- commit aacb454 + +------------------------------------------------------------------- @@ -43,0 +93,6 @@ +Tue Aug 29 12:02:37 CEST 2017 - [email protected] + +- Update config files: enable CONFIG_SPI_PXA2XX for MacBook (bsc#1055817) +- commit 3ce18e9 + +------------------------------------------------------------------- @@ -47 +102,9 @@ -- commit df5244b +- commit 0b3ef4c + +------------------------------------------------------------------- +Mon Aug 28 10:48:06 CEST 2017 - [email protected] + +- rpm/kernel-docs.spec.in: Disable PDF build again + ... due to the breakage with the recent TeXLive 2017. + Also add the missing dependency on texlive-varwidth. +- commit d3a32e7 @@ -59,0 +123,7 @@ +Wed Aug 23 09:39:35 CEST 2017 - [email protected] + +- ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978) + (bsc#1020657). +- commit 3f6a0b2 + +------------------------------------------------------------------- @@ -73,0 +144,6 @@ +Tue Aug 22 20:13:09 CEST 2017 - [email protected] + +- ALSA: ice1712: Add support for STAudio ADCIII (bsc#1048934). +- commit 99a99ef + +------------------------------------------------------------------- @@ -79,0 +156,6 @@ +Tue Aug 22 19:55:58 CEST 2017 - [email protected] + +- ALSA: hda - Implement mic-mute LED mode enum (bsc#1055013). +- commit a3c362f + +------------------------------------------------------------------- @@ -85,0 +168,33 @@ +Mon Aug 21 04:15:39 CEST 2017 - [email protected] + +- Update to 4.13-rc6. +- commit ee50b89 + +------------------------------------------------------------------- +Fri Aug 18 16:14:38 CEST 2017 - [email protected] + +- Do not ship firmware (bsc#1054239). + Pull firmware from kernel-firmware instead. +- commit 0b0b5c9 + +------------------------------------------------------------------- +Thu Aug 17 14:56:01 CEST 2017 - [email protected] + +- supported.conf: clear mistaken external support flag for cifs.ko (bsc#1053802). +- commit 75e287e + +------------------------------------------------------------------- +Thu Aug 17 14:55:42 CEST 2017 - [email protected] + +- supported.conf: mark reiserfs unsupported (FATE#323394). + ReiserFS is not supported in SLE15. ReiserFS file systems must be + transferred or converted before installing. +- commit 8a547c5 + +------------------------------------------------------------------- +Thu Aug 17 14:55:28 CEST 2017 - [email protected] + +- Update to 4.13-rc5. +- commit c3fb699 + +------------------------------------------------------------------- @@ -123,0 +239,20 @@ +Sat Aug 12 01:19:37 CEST 2017 - [email protected] + +- uapi: add a compatibility layer between linux/uio.h and glibc + (bsc#1053501). +- commit fe56e41 + +------------------------------------------------------------------- +Thu Aug 10 17:07:43 CEST 2017 - [email protected] + +- Refresh vanilla config. +- commit ae18928 + +------------------------------------------------------------------- +Wed Aug 9 10:35:04 CEST 2017 - [email protected] + +- Delete stale patches.fixes/scsi-ibmvscsi-module_alias.patch. +- Delete stale patches.suse/suse-ppc64-branding. +- commit 1c8934b + +------------------------------------------------------------------- @@ -130,0 +266,6 @@ +Tue Aug 8 05:07:56 CEST 2017 - [email protected] + +- Update to 4.13-rc4. +- commit 94b098f + +------------------------------------------------------------------- @@ -139,0 +281,14 @@ +Wed Aug 2 15:44:30 CEST 2017 - [email protected] + +- rpm/kernel-docs.spec.in: Fix package list and enable building PDFs + Finally it works! Added some missing pieces (ImageMagick, some texlive + subpkgs) in addition to use explicitly python3-Sphinx stuff. +- commit e18c03e + +------------------------------------------------------------------- +Mon Jul 31 15:43:01 CEST 2017 - [email protected] + +- Update to 4.13-rc3. +- commit 4ef483a + +------------------------------------------------------------------- @@ -194,0 +350,13 @@ +- x86/kconfig: Make it easier to switch to the new ORC unwinder + (bnc#1018348). +- x86/kconfig: Consolidate unwinders into multiple choice + selection (bnc#1018348). +- Update config files. +- Refresh + patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch. +- Refresh + patches.suse/0002-dwarf-do-not-throw-away-unwind-info.patch. +- Refresh + patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch. + Update to version from -tip. ORC is in -tip completely. So make sure + we use the upstream version. @@ -219,0 +388,9 @@ +Wed Jul 26 19:55:58 CEST 2017 - [email protected] + +- Update to 4.13-rc2. +- Eliminated 1 patch. +- Config changes: + - DRM_VBOXVIDEO=m +- commit b545b87 + +------------------------------------------------------------------- @@ -224 +401,9 @@ -- commit 93ed5e8 ++++ 187 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/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-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 kernel-zfcpdump.changes: same change Old: ---- linux-4.12.tar.xz New: ---- linux-4.13.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:18.754309875 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:18.758309313 +0200 @@ -16,8 +16,8 @@ # -%define srcversion 4.12 -%define patchversion 4.12.11 +%define srcversion 4.13 +%define patchversion 4.13.1 %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}) Name: dtb-aarch64 -Version: 4.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:18.838298071 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:18.842297509 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.12 -%define patchversion 4.12.11 +%define srcversion 4.13 +%define patchversion 4.13.1 %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.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif @@ -102,6 +102,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils @@ -343,8 +344,6 @@ %obsolete_kmp rt3592 2.4.1.1_3 %obsolete_kmp rt5390 2.4.0.4_3 %obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 %obsolete_kmp compat-wireless 3.12 %obsolete_kmp rts5229 1.08 %obsolete_kmp rts_pstor 1.11 @@ -827,11 +826,12 @@ fi fi - # arch/powerpc/lib/crtsavres.o is required for building external - # modules on powerpc - if [ -f %kernel_build_dir/arch/powerpc/lib/crtsavres.o ]; then - echo arch/powerpc/lib/crtsavres.o >> %my_builddir/obj-files + # These files are required for building external modules + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + if [ -f %kernel_build_dir/$FILE ]; then + echo $FILE >> %my_builddir/obj-files fi + done tar -cf - -T %my_builddir/obj-files | \ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor @@ -849,6 +849,8 @@ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi +rm -rf %{buildroot}/lib/firmware + add_dirs_to_filelist() { sed -rn ' # print file name @@ -963,6 +965,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:18.930285144 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:18.934284581 +0200 @@ -16,12 +16,12 @@ # -%define patchversion 4.12.11 +%define patchversion 4.13.1 %define variant %{nil} %include %_sourcedir/kernel-spec-macros -# rst2pdf is broken with Sphinx 1.3.x, so disabled for now +%define build_html 1 %define build_pdf 0 # copy the whole tree to generate some images (sigh...) @@ -34,23 +34,35 @@ %endif Name: kernel-docs -Summary: Kernel Documentation (man pages) +Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 4.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif BuildRequires: kernel-source%variant -# remaining stuff, to be fixed after 4.12 -BuildRequires: xmlto +%if %build_pdf || %build_html # ReST handling BuildRequires: graphviz -BuildRequires: python-Sphinx +BuildRequires: graphviz-gd +BuildRequires: graphviz-gnome +BuildRequires: ImageMagick +BuildRequires: python3-Sphinx +BuildRequires: texlive-anyfontsize %if %build_pdf -BuildRequires: python-rst2pdf +BuildRequires: python3-Sphinx-latex +BuildRequires: texlive-adjustbox +BuildRequires: texlive-dejavu +BuildRequires: texlive-dejavu-fonts +BuildRequires: texlive-glyphlist +BuildRequires: texlive-makeindex +BuildRequires: texlive-varwidth +BuildRequires: texlive-xetex +BuildRequires: texlive-zapfding +%endif %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel @@ -59,7 +71,7 @@ Source: kernel-spec-macros %description -These are the man pages (section 9) built from the current kernel sources. +A few basic documents from the current kernel sources. %source_timestamp @@ -74,6 +86,7 @@ %source_timestamp %endif +%if %build_html %package html Summary: Kernel Documentation (HTML) Group: Documentation/HTML @@ -82,6 +95,7 @@ These are HTML documents built from the current kernel sources. %source_timestamp +%endif %prep %setup -T -c @@ -92,22 +106,25 @@ %build export LANG=en_US +%if %build_html mkdir -p html make %{?make_arg} O=$PWD/html htmldocs +%endif %if %build_pdf mkdir -p pdf make %{?make_arg} O=$PWD/pdf pdfdocs %endif %install +%if %build_html install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +%endif %if %build_pdf install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf -# copy PDF files generated by sphinx (once when it really works...) -for i in pdf/Documentation/output/*.pdf; do - test -s $i && cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf +for i in pdf/Documentation/output/latex/*.pdf; do + cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf done %endif @@ -127,10 +144,12 @@ %{_datadir}/doc/kernel/pdf %endif +%if %build_html %files html %defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/html %{_datadir}/doc/kernel/html +%endif %changelog ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:18.954281771 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:18.958281209 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.12 -%define patchversion 4.12.11 +%define srcversion 4.13 +%define patchversion 4.13.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 4.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif @@ -102,6 +102,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils @@ -343,8 +344,6 @@ %obsolete_kmp rt3592 2.4.1.1_3 %obsolete_kmp rt5390 2.4.0.4_3 %obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 %obsolete_kmp compat-wireless 3.12 %obsolete_kmp rts5229 1.08 %obsolete_kmp rts_pstor 1.11 @@ -825,11 +824,12 @@ fi fi - # arch/powerpc/lib/crtsavres.o is required for building external - # modules on powerpc - if [ -f %kernel_build_dir/arch/powerpc/lib/crtsavres.o ]; then - echo arch/powerpc/lib/crtsavres.o >> %my_builddir/obj-files + # These files are required for building external modules + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + if [ -f %kernel_build_dir/$FILE ]; then + echo $FILE >> %my_builddir/obj-files fi + done tar -cf - -T %my_builddir/obj-files | \ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor @@ -847,6 +847,8 @@ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi +rm -rf %{buildroot}/lib/firmware + add_dirs_to_filelist() { sed -rn ' # print file name @@ -961,6 +963,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:18.982277836 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:18.982277836 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.12.11 +%define patchversion 4.13.1 %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.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.002275026 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.006274464 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.12.11 +%define patchversion 4.13.1 %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.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.030271092 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.030271092 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.12 -%define patchversion 4.12.11 +%define srcversion 4.13 +%define patchversion 4.13.1 %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.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif @@ -102,6 +102,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils @@ -365,8 +366,6 @@ %obsolete_kmp rt3592 2.4.1.1_3 %obsolete_kmp rt5390 2.4.0.4_3 %obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 %obsolete_kmp compat-wireless 3.12 %obsolete_kmp rts5229 1.08 %obsolete_kmp rts_pstor 1.11 @@ -853,11 +852,12 @@ fi fi - # arch/powerpc/lib/crtsavres.o is required for building external - # modules on powerpc - if [ -f %kernel_build_dir/arch/powerpc/lib/crtsavres.o ]; then - echo arch/powerpc/lib/crtsavres.o >> %my_builddir/obj-files + # These files are required for building external modules + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + if [ -f %kernel_build_dir/$FILE ]; then + echo $FILE >> %my_builddir/obj-files fi + done tar -cf - -T %my_builddir/obj-files | \ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor @@ -875,6 +875,8 @@ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi +rm -rf %{buildroot}/lib/firmware + add_dirs_to_filelist() { sed -rn ' # print file name @@ -989,6 +991,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.054267719 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.054267719 +0200 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.12 -%define patchversion 4.12.11 +%define srcversion 4.13 +%define patchversion 4.13.1 %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.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.082263785 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.082263785 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.12.11 +Version: 4.13.1 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif ++++++ kernel-syzkaller.spec ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.114259288 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.114259288 +0200 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.12 -%define patchversion 4.12.11 +%define srcversion 4.13 +%define patchversion 4.13.1 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel used for fuzzing by syzkaller License: GPL-2.0 Group: System/Kernel -Version: 4.12.11 +Version: 4.13.1 %if 0%{?is_kotd} -Release: <RELEASE>.gbf7fb08 +Release: <RELEASE>.g0d725b5 %else Release: 0 %endif @@ -102,6 +102,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils @@ -343,8 +344,6 @@ %obsolete_kmp rt3592 2.4.1.1_3 %obsolete_kmp rt5390 2.4.0.4_3 %obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 %obsolete_kmp compat-wireless 3.12 %obsolete_kmp rts5229 1.08 %obsolete_kmp rts_pstor 1.11 @@ -826,11 +825,12 @@ fi fi - # arch/powerpc/lib/crtsavres.o is required for building external - # modules on powerpc - if [ -f %kernel_build_dir/arch/powerpc/lib/crtsavres.o ]; then - echo arch/powerpc/lib/crtsavres.o >> %my_builddir/obj-files + # These files are required for building external modules + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + if [ -f %kernel_build_dir/$FILE ]; then + echo $FILE >> %my_builddir/obj-files fi + done tar -cf - -T %my_builddir/obj-files | \ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor @@ -848,6 +848,8 @@ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi +rm -rf %{buildroot}/lib/firmware + add_dirs_to_filelist() { sed -rn ' # print file name @@ -962,6 +964,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils kernel-vanilla.spec: same change kernel-zfcpdump.spec: same change ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.318230621 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.318230621 +0200 @@ -1,5 +1,5 @@ <constraints> - <!-- Default 20GB for binary packages --> + <!-- Default 25GB for binary packages --> <overwrite> <conditions> <package>kernel-64kb</package> @@ -30,6 +30,9 @@ <disk> <size unit="G">35</size> </disk> + <physicalmemory> + <size unit="G">9</size> + </physicalmemory> </hardware> </overwrite> ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.414217132 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.414217132 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.12 +SRCVERSION=4.13 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 8640 lines of diff (skipped) ++++++ constraints.in ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.738171603 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.738171603 +0200 @@ -1,5 +1,5 @@ <constraints> - <!-- Default 20GB for binary packages --> + <!-- Default 25GB for binary packages --> <overwrite> <conditions> @BINARY_PACKAGES_XML@ @@ -23,6 +23,9 @@ <disk> <size unit="G">35</size> </disk> + <physicalmemory> + <size unit="G">9</size> + </physicalmemory> </hardware> </overwrite> ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.870153054 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.870153054 +0200 @@ -102,6 +102,7 @@ Requires(pre): coreutils awk # For /usr/lib/module-init-tools/weak-modules2 Requires(post): suse-module-tools +Recommends: kernel-firmware # For depmod (modutils is a dependency provided by both module-init-tools and # kmod-compat) Requires(post): modutils @@ -223,8 +224,6 @@ %obsolete_kmp rt3592 2.4.1.1_3 %obsolete_kmp rt5390 2.4.0.4_3 %obsolete_kmp ath3k 1.0_3 -Obsoletes: ath3k-firmware <= 1.0 -Provides: ath3k-firmware = 1.0 %obsolete_kmp compat-wireless 3.12 %obsolete_kmp rts5229 1.08 %obsolete_kmp rts_pstor 1.11 @@ -704,11 +703,12 @@ fi fi - # arch/powerpc/lib/crtsavres.o is required for building external - # modules on powerpc - if [ -f %kernel_build_dir/arch/powerpc/lib/crtsavres.o ]; then - echo arch/powerpc/lib/crtsavres.o >> %my_builddir/obj-files - fi + # These files are required for building external modules + for FILE in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do + if [ -f %kernel_build_dir/$FILE ]; then + echo $FILE >> %my_builddir/obj-files + fi + done tar -cf - -T %my_builddir/obj-files | \ tar -xf - -C %rpm_install_dir/%cpu_arch_flavor @@ -726,6 +726,8 @@ $(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/') fi +rm -rf %{buildroot}/lib/firmware + add_dirs_to_filelist() { sed -rn ' # print file name ++++++ kernel-docs.spec.in ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:19.918146309 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:19.918146309 +0200 @@ -21,7 +21,7 @@ %include %_sourcedir/kernel-spec-macros -# rst2pdf is broken with Sphinx 1.3.x, so disabled for now +%define build_html 1 %define build_pdf 0 # copy the whole tree to generate some images (sigh...) @@ -34,7 +34,7 @@ %endif Name: kernel-docs@VARIANT@ -Summary: Kernel Documentation (man pages) +Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man Version: @RPMVERSION@ @@ -44,13 +44,25 @@ Release: @RELEASE@ %endif BuildRequires: kernel-source%variant -# remaining stuff, to be fixed after 4.12 -BuildRequires: xmlto +%if %build_pdf || %build_html # ReST handling BuildRequires: graphviz -BuildRequires: python-Sphinx +BuildRequires: graphviz-gd +BuildRequires: graphviz-gnome +BuildRequires: ImageMagick +BuildRequires: python3-Sphinx +BuildRequires: texlive-anyfontsize %if %build_pdf -BuildRequires: python-rst2pdf +BuildRequires: python3-Sphinx-latex +BuildRequires: texlive-adjustbox +BuildRequires: texlive-dejavu +BuildRequires: texlive-dejavu-fonts +BuildRequires: texlive-glyphlist +BuildRequires: texlive-makeindex +BuildRequires: texlive-varwidth +BuildRequires: texlive-xetex +BuildRequires: texlive-zapfding +%endif %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel @@ -59,7 +71,7 @@ Source: kernel-spec-macros %description -These are the man pages (section 9) built from the current kernel sources. +A few basic documents from the current kernel sources. %source_timestamp @@ -74,6 +86,7 @@ %source_timestamp %endif +%if %build_html %package html Summary: Kernel Documentation (HTML) Group: Documentation/HTML @@ -82,6 +95,7 @@ These are HTML documents built from the current kernel sources. %source_timestamp +%endif %prep %setup -T -c @@ -92,22 +106,25 @@ %build export LANG=en_US +%if %build_html mkdir -p html make %{?make_arg} O=$PWD/html htmldocs +%endif %if %build_pdf mkdir -p pdf make %{?make_arg} O=$PWD/pdf pdfdocs %endif %install +%if %build_html install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst cp -a html/Documentation/output/* $RPM_BUILD_ROOT%{_datadir}/doc/kernel/html/rst || true +%endif %if %build_pdf install -d $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf -# copy PDF files generated by sphinx (once when it really works...) -for i in pdf/Documentation/output/*.pdf; do - test -s $i && cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf +for i in pdf/Documentation/output/latex/*.pdf; do + cp -a $i $RPM_BUILD_ROOT%{_datadir}/doc/kernel/pdf done %endif @@ -127,10 +144,12 @@ %{_datadir}/doc/kernel/pdf %endif +%if %build_html %files html %defattr(-,root,root) %dir %{_datadir}/doc/kernel %docdir %{_datadir}/doc/kernel/html %{_datadir}/doc/kernel/html +%endif %changelog ++++++ linux-4.12.tar.xz -> linux-4.13.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.12.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.13.tar.xz differ: char 15, line 1 ++++++ patches.apparmor.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-basic-networking-rules-4.11-rc1.patch new/patches.apparmor/apparmor-basic-networking-rules-4.11-rc1.patch --- old/patches.apparmor/apparmor-basic-networking-rules-4.11-rc1.patch 2017-05-29 15:03:41.000000000 +0200 +++ new/patches.apparmor/apparmor-basic-networking-rules-4.11-rc1.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,151 +0,0 @@ -From: Jeff Mahoney <[email protected]> -Subject: apparmor: update apparmor-basic-networking-rules for 4.11-rc1 -Patch-mainline: depends on apparmor-basic-networking-rules.patch -References: FATE#300516 - -4.11-rc1 changed op from a index into an array of strings to the strings -themselves. - -It also renamed: OP_SOCK_SHUTDOWN to OP_SHUTDOWN and -common_audit_data.aad to common_audit_data.apparmor_audit_data and removed -the gfp_t parameter from aa_audit. - -Signed-off-by: Jeff Mahoney <[email protected]> ---- - security/apparmor/include/net.h | 4 ++-- - security/apparmor/lsm.c | 2 +- - security/apparmor/net.c | 39 ++++++++++++++++++++------------------- - 3 files changed, 23 insertions(+), 22 deletions(-) - -diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h -index cb8a12109b7a..2f40d7e54398 100644 ---- a/security/apparmor/include/net.h -+++ b/security/apparmor/include/net.h -@@ -32,9 +32,9 @@ struct aa_net { - - extern struct aa_fs_entry aa_fs_entry_network[]; - --extern int aa_net_perm(int op, struct aa_profile *profile, u16 family, -+extern int aa_net_perm(const char *op, struct aa_profile *profile, u16 family, - int type, int protocol, struct sock *sk); --extern int aa_revalidate_sk(int op, struct sock *sk); -+extern int aa_revalidate_sk(const char *op, struct sock *sk); - - static inline void aa_free_net_rules(struct aa_net *new) - { -diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index b83cbd494e17..758ddf4a0791 100644 ---- a/security/apparmor/lsm.c -+++ b/security/apparmor/lsm.c -@@ -683,7 +683,7 @@ static int apparmor_socket_shutdown(struct socket *sock, int how) - { - struct sock *sk = sock->sk; - -- return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk); -+ return aa_revalidate_sk(OP_SHUTDOWN, sk); - } - - static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = { -diff --git a/security/apparmor/net.c b/security/apparmor/net.c -index 003dd18c61a5..ac9622de8b6d 100644 ---- a/security/apparmor/net.c -+++ b/security/apparmor/net.c -@@ -37,12 +37,12 @@ static void audit_cb(struct audit_buffer *ab, void *va) - audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family); - } - audit_log_format(ab, " sock_type="); -- if (sock_type_names[sa->aad->net.type]) { -- audit_log_string(ab, sock_type_names[sa->aad->net.type]); -+ if (sock_type_names[aad(sa)->net.type]) { -+ audit_log_string(ab, sock_type_names[aad(sa)->net.type]); - } else { -- audit_log_format(ab, "\"unknown(%d)\"", sa->aad->net.type); -+ audit_log_format(ab, "\"unknown(%d)\"", aad(sa)->net.type); - } -- audit_log_format(ab, " protocol=%d", sa->aad->net.protocol); -+ audit_log_format(ab, " protocol=%d", aad(sa)->net.protocol); - } - - /** -@@ -57,8 +57,9 @@ static void audit_cb(struct audit_buffer *ab, void *va) - * - * Returns: %0 or sa->error else other errorcode on failure - */ --static int audit_net(struct aa_profile *profile, int op, u16 family, int type, -- int protocol, struct sock *sk, int error) -+static int audit_net(struct aa_profile *profile, const char *op, -+ u16 family, int type, int protocol, -+ struct sock *sk, int error) - { - int audit_type = AUDIT_APPARMOR_AUTO; - struct common_audit_data sa; -@@ -70,25 +71,25 @@ static int audit_net(struct aa_profile *profile, int op, u16 family, int type, - sa.type = LSM_AUDIT_DATA_NONE; - } - /* todo fill in socket addr info */ -- sa.aad = &aad; -+ aad(&sa) = &aad; - sa.u.net = &net; -- sa.aad->op = op, -+ aad(&sa)->op = op, - sa.u.net->family = family; - sa.u.net->sk = sk; -- sa.aad->net.type = type; -- sa.aad->net.protocol = protocol; -- sa.aad->error = error; -+ aad(&sa)->net.type = type; -+ aad(&sa)->net.protocol = protocol; -+ aad(&sa)->error = error; - -- if (likely(!sa.aad->error)) { -+ if (likely(!aad(&sa)->error)) { - u16 audit_mask = profile->net.audit[sa.u.net->family]; - if (likely((AUDIT_MODE(profile) != AUDIT_ALL) && -- !(1 << sa.aad->net.type & audit_mask))) -+ !(1 << aad(&sa)->net.type & audit_mask))) - return 0; - audit_type = AUDIT_APPARMOR_AUDIT; - } else { - u16 quiet_mask = profile->net.quiet[sa.u.net->family]; - u16 kill_mask = 0; -- u16 denied = (1 << sa.aad->net.type) & ~quiet_mask; -+ u16 denied = (1 << aad(&sa)->net.type) & ~quiet_mask; - - if (denied & kill_mask) - audit_type = AUDIT_APPARMOR_KILL; -@@ -96,10 +97,10 @@ static int audit_net(struct aa_profile *profile, int op, u16 family, int type, - if ((denied & quiet_mask) && - AUDIT_MODE(profile) != AUDIT_NOQUIET && - AUDIT_MODE(profile) != AUDIT_ALL) -- return COMPLAIN_MODE(profile) ? 0 : sa.aad->error; -+ return COMPLAIN_MODE(profile) ? 0 : aad(&sa)->error; - } - -- return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb); -+ return aa_audit(audit_type, profile, &sa, audit_cb); - } - - /** -@@ -112,8 +113,8 @@ static int audit_net(struct aa_profile *profile, int op, u16 family, int type, - * - * Returns: %0 else error if permission denied - */ --int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type, -- int protocol, struct sock *sk) -+int aa_net_perm(const char *op, struct aa_profile *profile, u16 family, -+ int type, int protocol, struct sock *sk) - { - u16 family_mask; - int error; -@@ -142,7 +143,7 @@ int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type, - * - * Returns: %0 else error if permission denied - */ --int aa_revalidate_sk(int op, struct sock *sk) -+int aa_revalidate_sk(const char *op, struct sock *sk) - { - struct aa_profile *profile; - int error = 0; --- -2.13.0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.apparmor/apparmor-basic-networking-rules.patch new/patches.apparmor/apparmor-basic-networking-rules.patch --- old/patches.apparmor/apparmor-basic-networking-rules.patch 2017-05-29 15:03:41.000000000 +0200 +++ new/patches.apparmor/apparmor-basic-networking-rules.patch 2017-07-17 23:52:03.000000000 +0200 @@ -11,22 +11,20 @@ Signed-off-by: John Johansen <[email protected]> Acked-by: Jeff Mahoney <[email protected]> --- - security/apparmor/.gitignore | 1 + - security/apparmor/Makefile | 42 +++++++++- - security/apparmor/apparmorfs.c | 1 + - security/apparmor/include/audit.h | 4 + - security/apparmor/include/net.h | 44 ++++++++++ - security/apparmor/include/policy.h | 3 + - security/apparmor/lsm.c | 112 +++++++++++++++++++++++++ - security/apparmor/net.c | 162 +++++++++++++++++++++++++++++++++++++ - security/apparmor/policy.c | 1 + - security/apparmor/policy_unpack.c | 46 +++++++++++ - 10 files changed, 414 insertions(+), 2 deletions(-) + security/apparmor/.gitignore | 1 + security/apparmor/Makefile | 42 ++++++++ + security/apparmor/apparmorfs.c | 1 + security/apparmor/include/audit.h | 4 + security/apparmor/include/net.h | 44 +++++++++ + security/apparmor/include/policy.h | 3 + security/apparmor/lsm.c | 112 +++++++++++++++++++++++ + security/apparmor/net.c | 175 +++++++++++++++++++++++++++++++++++++ + security/apparmor/policy.c | 1 + security/apparmor/policy_unpack.c | 46 +++++++++ + 10 files changed, 427 insertions(+), 2 deletions(-) create mode 100644 security/apparmor/include/net.h create mode 100644 security/apparmor/net.c -diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore -index 9cdec70d72b8..d5b291e94264 100644 --- a/security/apparmor/.gitignore +++ b/security/apparmor/.gitignore @@ -1,5 +1,6 @@ @@ -36,16 +34,14 @@ +net_names.h capability_names.h rlim_names.h -diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile -index ad369a7aac24..a7dc10be232d 100644 --- a/security/apparmor/Makefile +++ b/security/apparmor/Makefile -@@ -4,10 +4,10 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o +@@ -4,10 +4,10 @@ obj-$(CONFIG_SECURITY_APPARMOR) += appar apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \ path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \ -- resource.o secid.o file.o policy_ns.o -+ resource.o secid.o file.o policy_ns.o net.o +- resource.o secid.o file.o policy_ns.o label.o ++ resource.o secid.o file.o policy_ns.o net.o label.o apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o -clean-files := capability_names.h rlim_names.h @@ -53,7 +49,7 @@ # Build a lower case string table of capability names -@@ -25,6 +25,38 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\ +@@ -25,6 +25,38 @@ cmd_make-caps = echo "static const char -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/\L\1/p' | \ tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@ @@ -92,7 +88,7 @@ # Build a lower case string table of rlimit names. # Transforms lines from -@@ -61,6 +93,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \ +@@ -61,6 +93,7 @@ cmd_make-rlim = echo "static const char tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@ $(obj)/capability.o : $(obj)/capability_names.h @@ -100,7 +96,7 @@ $(obj)/resource.o : $(obj)/rlim_names.h $(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \ $(src)/Makefile -@@ -68,3 +101,8 @@ $(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \ +@@ -68,3 +101,8 @@ $(obj)/capability_names.h : $(srctree)/i $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \ $(src)/Makefile $(call cmd,make-rlim) @@ -109,24 +105,20 @@ + $(src)/Makefile + $(call cmd,make-af) + $(call cmd,make-sock) -diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c -index 4f6ac9dbc65d..4b121211e5e7 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c -@@ -1209,6 +1209,7 @@ static struct aa_fs_entry aa_fs_entry_features[] = { - AA_FS_DIR("policy", aa_fs_entry_policy), - AA_FS_DIR("domain", aa_fs_entry_domain), - AA_FS_DIR("file", aa_fs_entry_file), -+ AA_FS_DIR("network", aa_fs_entry_network), - AA_FS_FILE_U64("capability", VFS_CAP_FLAGS_MASK), - AA_FS_DIR("rlimit", aa_fs_entry_rlimit), - AA_FS_DIR("caps", aa_fs_entry_caps), -diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h -index fdc4774318ba..947b0447c9bf 100644 +@@ -2173,6 +2173,7 @@ static struct aa_sfs_entry aa_sfs_entry_ + AA_SFS_DIR("domain", aa_sfs_entry_domain), + AA_SFS_DIR("file", aa_sfs_entry_file), + AA_SFS_DIR("namespaces", aa_sfs_entry_ns), ++ AA_SFS_DIR("network", aa_sfs_entry_network), + AA_SFS_FILE_U64("capability", VFS_CAP_FLAGS_MASK), + AA_SFS_DIR("rlimit", aa_sfs_entry_rlimit), + AA_SFS_DIR("caps", aa_sfs_entry_caps), --- a/security/apparmor/include/audit.h +++ b/security/apparmor/include/audit.h -@@ -117,6 +117,10 @@ struct apparmor_audit_data { - u32 denied; +@@ -120,6 +120,10 @@ struct apparmor_audit_data { + const char *target; kuid_t ouid; } fs; + struct { @@ -136,9 +128,6 @@ }; struct { const char *name; -diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h -new file mode 100644 -index 000000000000..cb8a12109b7a --- /dev/null +++ b/security/apparmor/include/net.h @@ -0,0 +1,44 @@ @@ -174,11 +163,11 @@ + u16 quiet[AF_MAX]; +}; + -+extern struct aa_fs_entry aa_fs_entry_network[]; ++extern struct aa_sfs_entry aa_sfs_entry_network[]; + -+extern int aa_net_perm(int op, struct aa_profile *profile, u16 family, ++extern int aa_net_perm(const char *op, struct aa_label *label, u16 family, + int type, int protocol, struct sock *sk); -+extern int aa_revalidate_sk(int op, struct sock *sk); ++extern int aa_revalidate_sk(const char *op, struct sock *sk); + +static inline void aa_free_net_rules(struct aa_net *new) +{ @@ -186,8 +175,6 @@ +} + +#endif /* __AA_NET_H */ -diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h -index 67bc96afe541..a3d18ea8d730 100644 --- a/security/apparmor/include/policy.h +++ b/security/apparmor/include/policy.h @@ -28,6 +28,7 @@ @@ -196,9 +183,9 @@ #include "file.h" +#include "net.h" #include "lib.h" - #include "resource.h" - -@@ -132,6 +133,7 @@ struct aa_data { + #include "label.h" + #include "perms.h" +@@ -111,6 +112,7 @@ struct aa_data { * @policy: general match rules governing policy * @file: The set of rules governing basic file access and domain transitions * @caps: capabilities for the profile @@ -206,7 +193,7 @@ * @rlimits: rlimits for the profile * * @dents: dentries for the profiles file entries in apparmorfs -@@ -174,6 +176,7 @@ struct aa_profile { +@@ -148,6 +150,7 @@ struct aa_profile { struct aa_policydb policy; struct aa_file_rules file; struct aa_caps caps; @@ -214,8 +201,6 @@ struct aa_rlimit rlimits; struct aa_loaddata *rawdata; -diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c -index 8f3c0f7aca5a..b83cbd494e17 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -33,6 +33,7 @@ @@ -224,21 +209,21 @@ #include "include/ipc.h" +#include "include/net.h" #include "include/path.h" + #include "include/label.h" #include "include/policy.h" - #include "include/policy_ns.h" -@@ -587,6 +588,104 @@ static int apparmor_task_setrlimit(struct task_struct *task, +@@ -656,6 +657,104 @@ static int apparmor_task_setrlimit(struc return error; } +static int apparmor_socket_create(int family, int type, int protocol, int kern) +{ -+ struct aa_profile *profile; ++ struct aa_label *profile; + int error = 0; + + if (kern) + return 0; + -+ profile = __aa_current_profile(); ++ profile = aa_current_raw_label(); + if (!unconfined(profile)) + error = aa_net_perm(OP_CREATE, profile, family, type, protocol, + NULL); @@ -325,13 +310,13 @@ +{ + struct sock *sk = sock->sk; + -+ return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk); ++ return aa_revalidate_sk(OP_SHUTDOWN, sk); +} + static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = { LSM_HOOK_INIT(ptrace_access_check, apparmor_ptrace_access_check), LSM_HOOK_INIT(ptrace_traceme, apparmor_ptrace_traceme), -@@ -616,6 +715,19 @@ static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = { +@@ -686,6 +785,19 @@ static struct security_hook_list apparmo LSM_HOOK_INIT(getprocattr, apparmor_getprocattr), LSM_HOOK_INIT(setprocattr, apparmor_setprocattr), @@ -351,12 +336,9 @@ LSM_HOOK_INIT(cred_alloc_blank, apparmor_cred_alloc_blank), LSM_HOOK_INIT(cred_free, apparmor_cred_free), LSM_HOOK_INIT(cred_prepare, apparmor_cred_prepare), -diff --git a/security/apparmor/net.c b/security/apparmor/net.c -new file mode 100644 -index 000000000000..003dd18c61a5 --- /dev/null +++ b/security/apparmor/net.c -@@ -0,0 +1,162 @@ +@@ -0,0 +1,175 @@ +/* + * AppArmor security module + * @@ -379,8 +361,8 @@ + +#include "net_names.h" + -+struct aa_fs_entry aa_fs_entry_network[] = { -+ AA_FS_FILE_STRING("af_mask", AA_FS_AF_MASK), ++struct aa_sfs_entry aa_sfs_entry_network[] = { ++ AA_SFS_FILE_STRING("af_mask", AA_FS_AF_MASK), + { } +}; + @@ -396,12 +378,12 @@ + audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family); + } + audit_log_format(ab, " sock_type="); -+ if (sock_type_names[sa->aad->net.type]) { -+ audit_log_string(ab, sock_type_names[sa->aad->net.type]); ++ if (sock_type_names[aad(sa)->net.type]) { ++ audit_log_string(ab, sock_type_names[aad(sa)->net.type]); + } else { -+ audit_log_format(ab, "\"unknown(%d)\"", sa->aad->net.type); ++ audit_log_format(ab, "\"unknown(%d)\"", aad(sa)->net.type); + } -+ audit_log_format(ab, " protocol=%d", sa->aad->net.protocol); ++ audit_log_format(ab, " protocol=%d", aad(sa)->net.protocol); +} + +/** @@ -416,8 +398,9 @@ + * + * Returns: %0 or sa->error else other errorcode on failure + */ -+static int audit_net(struct aa_profile *profile, int op, u16 family, int type, -+ int protocol, struct sock *sk, int error) ++static int audit_net(struct aa_profile *profile, const char *op, ++ u16 family, int type, int protocol, ++ struct sock *sk, int error) +{ + int audit_type = AUDIT_APPARMOR_AUTO; + struct common_audit_data sa; @@ -429,25 +412,25 @@ + sa.type = LSM_AUDIT_DATA_NONE; + } + /* todo fill in socket addr info */ -+ sa.aad = &aad; ++ aad(&sa) = &aad; + sa.u.net = &net; -+ sa.aad->op = op, ++ aad(&sa)->op = op, + sa.u.net->family = family; + sa.u.net->sk = sk; -+ sa.aad->net.type = type; -+ sa.aad->net.protocol = protocol; -+ sa.aad->error = error; ++ aad(&sa)->net.type = type; ++ aad(&sa)->net.protocol = protocol; ++ aad(&sa)->error = error; + -+ if (likely(!sa.aad->error)) { ++ if (likely(!aad(&sa)->error)) { + u16 audit_mask = profile->net.audit[sa.u.net->family]; + if (likely((AUDIT_MODE(profile) != AUDIT_ALL) && -+ !(1 << sa.aad->net.type & audit_mask))) ++ !(1 << aad(&sa)->net.type & audit_mask))) + return 0; + audit_type = AUDIT_APPARMOR_AUDIT; + } else { + u16 quiet_mask = profile->net.quiet[sa.u.net->family]; + u16 kill_mask = 0; -+ u16 denied = (1 << sa.aad->net.type) & ~quiet_mask; ++ u16 denied = (1 << aad(&sa)->net.type) & ~quiet_mask; + + if (denied & kill_mask) + audit_type = AUDIT_APPARMOR_KILL; @@ -455,27 +438,42 @@ + if ((denied & quiet_mask) && + AUDIT_MODE(profile) != AUDIT_NOQUIET && + AUDIT_MODE(profile) != AUDIT_ALL) -+ return COMPLAIN_MODE(profile) ? 0 : sa.aad->error; ++ return COMPLAIN_MODE(profile) ? 0 : aad(&sa)->error; + } + -+ return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb); ++ return aa_audit(audit_type, profile, &sa, audit_cb); ++} ++ ++static int __aa_net_perm(const char *op, struct aa_profile *profile, u16 family, ++ int type, int protocol, struct sock *sk) ++{ ++ u16 family_mask; ++ int error; ++ ++ if (profile_unconfined(profile)) ++ return 0; ++ ++ family_mask = profile->net.allow[family]; ++ ++ error = (family_mask & (1 << type)) ? 0 : -EACCES; ++ ++ return audit_net(profile, op, family, type, protocol, sk, error); +} + +/** + * aa_net_perm - very course network access check + * @op: operation being checked -+ * @profile: profile being enforced (NOT NULL) ++ * @label: profile being enforced (NOT NULL) + * @family: network family + * @type: network type + * @protocol: network protocol + * + * Returns: %0 else error if permission denied + */ -+int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type, -+ int protocol, struct sock *sk) ++int aa_net_perm(const char *op, struct aa_label *label, u16 family, ++ int type, int protocol, struct sock *sk) +{ -+ u16 family_mask; -+ int error; ++ struct aa_profile *profile; + + if ((family < 0) || (family >= AF_MAX)) + return -EINVAL; @@ -487,11 +485,8 @@ + if (family == AF_UNIX || family == AF_NETLINK) + return 0; + -+ family_mask = profile->net.allow[family]; -+ -+ error = (family_mask & (1 << type)) ? 0 : -EACCES; -+ -+ return audit_net(profile, op, family, type, protocol, sk, error); ++ return fn_for_each_confined(label, profile, ++ __aa_net_perm(op, profile, family, type, protocol, sk)); +} + +/** @@ -501,9 +496,9 @@ + * + * Returns: %0 else error if permission denied + */ -+int aa_revalidate_sk(int op, struct sock *sk) ++int aa_revalidate_sk(const char *op, struct sock *sk) +{ -+ struct aa_profile *profile; ++ struct aa_label *profile; + int error = 0; + + /* aa_revalidate_sk should not be called from interrupt context @@ -512,18 +507,16 @@ + if (in_interrupt()) + return 0; + -+ profile = __aa_current_profile(); ++ profile = aa_current_raw_label(); + if (!unconfined(profile)) + error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type, + sk->sk_protocol, sk); + + return error; +} -diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c -index cf9d670dca94..0eea92aeb02d 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c -@@ -237,6 +237,7 @@ void aa_free_profile(struct aa_profile *profile) +@@ -225,6 +225,7 @@ void aa_free_profile(struct aa_profile * aa_free_file_rules(&profile->file); aa_free_cap_rules(&profile->caps); @@ -531,11 +524,9 @@ aa_free_rlimit_rules(&profile->rlimits); kzfree(profile->dirname); -diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c -index f3422a91353c..92d02d77c0d6 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c -@@ -217,6 +217,19 @@ static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name) +@@ -275,6 +275,19 @@ fail: return 0; } @@ -555,7 +546,7 @@ static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name) { if (unpack_nameX(e, AA_U32, name)) { -@@ -526,6 +539,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) +@@ -590,6 +603,7 @@ static struct aa_profile *unpack_profile int i, error = -EPROTO; kernel_cap_t tmpcap; u32 tmp; @@ -563,7 +554,7 @@ *ns_name = NULL; -@@ -635,6 +649,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name) +@@ -703,6 +717,38 @@ static struct aa_profile *unpack_profile if (!unpack_rlimits(e, profile)) goto fail; @@ -602,6 +593,3 @@ if (unpack_nameX(e, AA_STRUCT, "policydb")) { /* generic policy dfa - optional and may be NULL */ profile->policy.dfa = unpack_dfa(e); --- -2.13.0 - ++++++ patches.arch.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-pegasos-console-autodetection.patch new/patches.arch/ppc-pegasos-console-autodetection.patch --- old/patches.arch/ppc-pegasos-console-autodetection.patch 2017-06-02 13:37:34.000000000 +0200 +++ new/patches.arch/ppc-pegasos-console-autodetection.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -From: [email protected] -Subject: force speed to fix autodetection on pegasos2 -Patch-mainline: never - ---- - arch/powerpc/platforms/chrp/setup.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/powerpc/platforms/chrp/setup.c -+++ b/arch/powerpc/platforms/chrp/setup.c -@@ -293,7 +293,7 @@ static void chrp_init_early(void) - if (!property) - goto out_put; - if (!strcmp(property, "failsafe") || !strcmp(property, "serial")) -- add_preferred_console("ttyS", 0, NULL); -+ add_preferred_console("ttyS", 0, "115200"); - out_put: - of_node_put(node); - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.arch/ppc-prom-nodisplay.patch new/patches.arch/ppc-prom-nodisplay.patch --- old/patches.arch/ppc-prom-nodisplay.patch 2017-06-02 13:37:34.000000000 +0200 +++ new/patches.arch/ppc-prom-nodisplay.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -From: Olaf Hering <[email protected]> -Subject: new prom=nodisplay option to avoid crash in firmware on B50 -Patch-mainline: not yet - -add prom=nodisplay -avoid crash in firmware on IBM B50 when OF stdout is on serial. - - 0 > boot scsi/sd@4:1,yaboot | -yaboot starting: loaded at 00200000 00222530 (0/0/00c1a078; sp: 00efffd0) -brokenfirmware did not claim executable memory, fixed it myself -Config file 'yaboot.cnf' read, 213 bytes - -Welcome to yaboot version 10.1.22-r945.SuSE -booted from '/pci@80000000/scsi@10/sd@4:1,yaboot' -Enter "help" to get some basic usage information -boot: -* linux -boot: linux 3 -Please wait, loading kernel... -Allocated 00600000 bytes for executable @ 02000000 - Elf32 kernel loaded... -Loading ramdisk... -ramdisk loaded 0030e057 @ 04100000 -OF stdout device is: /pci@80000000/isa@b/serial@i3f8 -command line: root=/dev/system/root xmon=on sysrq=1 quiet panic=12 3 -memory layout at init: - memory_limit : 00000000 (16 MB aligned) - alloc_bottom : 0440f000 - alloc_top : 30000000 - alloc_top_hi : 40000000 - rmo_top : 30000000 - ram_top : 40000000 -Looking for displays -found display : /pci@80000000/display@16, opening ... -Unexpected Firmware Error: -DEFAULT CATCH!, code=fff00300 at %SRR0: 00c18ccc %SRR1: 00003030 - ok - 0 > reset-all - - ---- - arch/powerpc/kernel/prom_init.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - ---- a/arch/powerpc/kernel/prom_init.c 2013-04-24 12:10:43.019841829 -0400 -+++ b/arch/powerpc/kernel/prom_init.c 2013-04-24 12:11:13.347868807 -0400 -@@ -161,6 +161,7 @@ static unsigned long __initdata dt_strin - - static unsigned long __initdata prom_initrd_start, prom_initrd_end; - -+static int __initdata prom_no_display; - #ifdef CONFIG_PPC64 - static int __initdata prom_iommu_force_on; - static int __initdata prom_iommu_off; -@@ -601,6 +602,14 @@ static void __init early_cmdline_parse(v - #endif /* CONFIG_CMDLINE */ - prom_printf("command line: %s\n", prom_cmd_line); - -+ opt = strstr(prom_cmd_line, "prom="); -+ if (opt) { -+ opt += 5; -+ while (*opt && *opt == ' ') -+ opt++; -+ if (!strncmp(opt, "nodisplay", 9)) -+ prom_no_display = 1; -+ } - #ifdef CONFIG_PPC64 - opt = strstr(prom_cmd_line, "iommu="); - if (opt) { -@@ -2964,7 +2973,8 @@ unsigned long __init prom_init(unsigned - /* - * Initialize display devices - */ -- prom_check_displays(); -+ if (prom_no_display == 0) -+ prom_check_displays(); - - #if defined(CONFIG_PPC64) && defined(__BIG_ENDIAN__) - /* ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/e1000e-Don-t-return-uninitialized-stats.patch new/patches.drivers/e1000e-Don-t-return-uninitialized-stats.patch --- old/patches.drivers/e1000e-Don-t-return-uninitialized-stats.patch 2017-08-31 22:40:15.000000000 +0200 +++ new/patches.drivers/e1000e-Don-t-return-uninitialized-stats.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,31 +0,0 @@ -From: Benjamin Poirier <[email protected]> -Date: Fri, 21 Apr 2017 09:51:31 -0700 -Subject: e1000e: Don't return uninitialized stats -Patch-mainline: Submitted, http://patchwork.ozlabs.org/patch/763759/ -References: bug#1034635 - -Some statistics passed to ethtool are garbage because e1000e_get_stats64() -doesn't write them, for example: tx_heartbeat_errors. This leaks kernel -memory to userspace and confuses users. - -Do like ixgbe and use dev_get_stats() which first zeroes out -rtnl_link_stats64. - -Fixes: 5944701df90d ("net: remove useless memset's in drivers get_stats64") -Reported-by: Stefan Priebe <[email protected]> -Signed-off-by: Benjamin Poirier <[email protected]> ---- - drivers/net/ethernet/intel/e1000e/ethtool.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/ethernet/intel/e1000e/ethtool.c -+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c -@@ -2063,7 +2063,7 @@ static void e1000_get_ethtool_stats(stru - - pm_runtime_get_sync(netdev->dev.parent); - -- e1000e_get_stats64(netdev, &net_stats); -+ dev_get_stats(netdev, &net_stats); - - pm_runtime_put_sync(netdev->dev.parent); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ppc64-adb new/patches.drivers/ppc64-adb --- old/patches.drivers/ppc64-adb 2017-08-31 22:40:15.000000000 +0200 +++ new/patches.drivers/ppc64-adb 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -From: Olaf Hering <[email protected]> -Subject: enable mouse button emulation also for G5 -Patch-mainline: never - -fix compile errors - - drivers/macintosh/Kconfig | 2 +- - drivers/macintosh/adb.c | 4 ++++ - drivers/macintosh/adbhid.c | 6 +++++- - 3 files changed, 10 insertions(+), 2 deletions(-) - ---- a/drivers/macintosh/Kconfig -+++ b/drivers/macintosh/Kconfig -@@ -13,7 +13,7 @@ if MACINTOSH_DRIVERS - - config ADB - bool "Apple Desktop Bus (ADB) support" -- depends on MAC || (PPC_PMAC && PPC32) -+ depends on MAC || PPC_PMAC - help - Apple Desktop Bus (ADB) support is for support of devices which - are connected to an ADB port. ADB devices tend to have 4 pins. ---- a/drivers/macintosh/adb.c -+++ b/drivers/macintosh/adb.c -@@ -298,6 +298,10 @@ static int __init adb_init(void) - if (!machine_is(chrp) && !machine_is(powermac)) - return 0; - #endif -+#ifdef CONFIG_PPC64 -+ if (!machine_is(powermac)) -+ return 0; -+#endif - #ifdef CONFIG_MAC - if (!MACH_IS_MAC) - return 0; ---- a/drivers/macintosh/adbhid.c -+++ b/drivers/macintosh/adbhid.c -@@ -1264,10 +1264,14 @@ init_ms_a3(int id) - - static int __init adbhid_init(void) - { --#ifndef CONFIG_MAC -+#ifdef CONFIG_PPC32 - if (!machine_is(chrp) && !machine_is(powermac)) - return 0; - #endif -+#ifdef CONFIG_PPC64 -+ if (!machine_is(powermac)) -+ return 0; -+#endif - - led_request.complete = 1; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips new/patches.drivers/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips --- old/patches.drivers/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips 2017-08-31 22:40:15.000000000 +0200 +++ new/patches.drivers/rt2800-fix-TX_PIN_CFG-setting-for-non-MT7620-chips 2017-09-07 13:19:07.000000000 +0200 @@ -26,13 +26,13 @@ --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c -@@ -3699,7 +3699,10 @@ static void rt2800_config_channel(struct +@@ -3702,7 +3702,10 @@ static void rt2800_config_channel(struct if (rt2x00_rt(rt2x00dev, RT3572)) rt2800_rfcsr_write(rt2x00dev, 8, 0); -- rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin); +- tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG); + if (rt2x00_rt(rt2x00dev, RT6352)) -+ rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin); ++ tx_pin = rt2800_register_read(rt2x00dev, TX_PIN_CFG); + else + tx_pin = 0; ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/0001-fs-fcntl-f_setown-allow-returning-error.patch new/patches.fixes/0001-fs-fcntl-f_setown-allow-returning-error.patch --- old/patches.fixes/0001-fs-fcntl-f_setown-allow-returning-error.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/0001-fs-fcntl-f_setown-allow-returning-error.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -From: Jiri Slaby <[email protected]> -Date: Tue, 13 Jun 2017 13:35:50 +0200 -Subject: fs/fcntl: f_setown, allow returning error -Patch-mainline: 4.13-rc1 -Git-commit: 393cc3f51135ea2520521f776ef3afdf3395c797 -References: bnc#1006180 - -Allow f_setown to return an error value. We will fail in the next patch -with EINVAL for bad input to f_setown, so tile the path for the later -patch. - -Signed-off-by: Jiri Slaby <[email protected]> -Reviewed-by: Jeff Layton <[email protected]> -Cc: Jeff Layton <[email protected]> -Cc: "J. Bruce Fields" <[email protected]> -Cc: Alexander Viro <[email protected]> -Cc: [email protected] -Signed-off-by: Jeff Layton <[email protected]> ---- - fs/fcntl.c | 7 ++++--- - include/linux/fs.h | 2 +- - net/socket.c | 3 +-- - 3 files changed, 6 insertions(+), 6 deletions(-) - ---- a/fs/fcntl.c -+++ b/fs/fcntl.c -@@ -109,7 +109,7 @@ void __f_setown(struct file *filp, struc - } - EXPORT_SYMBOL(__f_setown); - --void f_setown(struct file *filp, unsigned long arg, int force) -+int f_setown(struct file *filp, unsigned long arg, int force) - { - enum pid_type type; - struct pid *pid; -@@ -123,6 +123,8 @@ void f_setown(struct file *filp, unsigne - pid = find_vpid(who); - __f_setown(filp, pid, type, force); - rcu_read_unlock(); -+ -+ return 0; - } - EXPORT_SYMBOL(f_setown); - -@@ -297,8 +299,7 @@ static long do_fcntl(int fd, unsigned in - force_successful_syscall_return(); - break; - case F_SETOWN: -- f_setown(filp, arg, 1); -- err = 0; -+ err = f_setown(filp, arg, 1); - break; - case F_GETOWN_EX: - err = f_getown_ex(filp, arg); ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -1249,7 +1249,7 @@ extern void fasync_free(struct fasync_st - extern void kill_fasync(struct fasync_struct **, int, int); - - extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); --extern void f_setown(struct file *filp, unsigned long arg, int force); -+extern int f_setown(struct file *filp, unsigned long arg, int force); - extern void f_delown(struct file *filp); - extern pid_t f_getown(struct file *filp); - extern int send_sigurg(struct fown_struct *fown); ---- a/net/socket.c -+++ b/net/socket.c -@@ -950,8 +950,7 @@ static long sock_ioctl(struct file *file - err = -EFAULT; - if (get_user(pid, (int __user *)argp)) - break; -- f_setown(sock->file, pid, 1); -- err = 0; -+ err = f_setown(sock->file, pid, 1); - break; - case FIOGETOWN: - case SIOCGPGRP: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/0002-fs-fcntl-f_setown-avoid-undefined-behaviour.patch new/patches.fixes/0002-fs-fcntl-f_setown-avoid-undefined-behaviour.patch --- old/patches.fixes/0002-fs-fcntl-f_setown-avoid-undefined-behaviour.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/0002-fs-fcntl-f_setown-avoid-undefined-behaviour.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -From: Jiri Slaby <[email protected]> -Date: Tue, 13 Jun 2017 13:35:51 +0200 -Subject: fs/fcntl: f_setown, avoid undefined behaviour -Patch-mainline: 4.13-rc1 -Git-commit: fc3dc67471461c0efcb1ed22fb7595121d65fad9 -References: bnc#1006180 - -fcntl(0, F_SETOWN, 0x80000000) triggers: -UBSAN: Undefined behaviour in fs/fcntl.c:118:7 -negation of -2147483648 cannot be represented in type 'int': -CPU: 1 PID: 18261 Comm: syz-executor Not tainted 4.8.1-0-syzkaller #1 -... -Call Trace: -... - [<ffffffffad8f0868>] ? f_setown+0x1d8/0x200 - [<ffffffffad8f19a9>] ? SyS_fcntl+0x999/0xf30 - [<ffffffffaed1fb00>] ? entry_SYSCALL_64_fastpath+0x23/0xc1 - -Fix that by checking the arg parameter properly (against INT_MAX) before -"who = -who". And return immediatelly with -EINVAL in case it is wrong. -Note that according to POSIX we can return EINVAL: - http://pubs.opengroup.org/onlinepubs/9699919799/functions/fcntl.html - - [EINVAL] - The cmd argument is F_SETOWN and the value of the argument - is not valid as a process or process group identifier. - -[v2] returns an error, v1 used to fail silently -[v3] implement proper check for the bad value INT_MIN - -Signed-off-by: Jiri Slaby <[email protected]> -Cc: Jeff Layton <[email protected]> -Cc: "J. Bruce Fields" <[email protected]> -Cc: Alexander Viro <[email protected]> -Cc: [email protected] -Signed-off-by: Jeff Layton <[email protected]> ---- - fs/fcntl.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/fs/fcntl.c -+++ b/fs/fcntl.c -@@ -116,6 +116,10 @@ int f_setown(struct file *filp, unsigned - int who = arg; - type = PIDTYPE_PID; - if (who < 0) { -+ /* avoid overflow below */ -+ if (who == INT_MIN) -+ return -EINVAL; -+ - type = PIDTYPE_PGID; - who = -who; - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/block-copy-bi_vcnt-in-_bio_clone_fast new/patches.fixes/block-copy-bi_vcnt-in-_bio_clone_fast --- old/patches.fixes/block-copy-bi_vcnt-in-_bio_clone_fast 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/block-copy-bi_vcnt-in-_bio_clone_fast 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -From: Jeff Mahoney <[email protected]> -Subject: block: copy bi_vcnt in __bio_clone_fast -References: boo#888259 -Patch-mainline: Submitted to LKML, 8 Oct 2014 - -Commit 05f1dd53152173 (block: add queue flag for disabling SG merging) uses -bi_vcnt to assign bio->bi_phys_segments if sg merging is disabled. When -using device mapper on top of a blk-mq device (virtio_blk in my test), -we'd end up overflowing the scatterlist in __blk_bios_map_sg. - -__bio_clone_fast copies bi_iter and bi_io_vec but not bi_vcnt, so -blk_recount_segments would report bi_phys_segments as 0. Since -rq->nr_phys_segments is 0 as well, the checks to ensure that we don't -exceed the queue's segment end up allowing more bios (and segments) to -attach the a request until the we finally map it. That also means we'd -pass the BUG_ON at the beginning of virtio_queue_rq, ultimately causing -memory corruption and a crash. - -If we copy bi_vcnt in __bio_clone_fast, the bios and requests properly -report the number of segments and everything works as expected. - -Originally reported at http://bugzilla.opensuse.org/show_bug.cgi?id=888259 - -Reported-by: Stephen Kulow <[email protected]> -Signed-off-by: Jeff Mahoney <[email protected]> ---- - - block/bio.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/block/bio.c -+++ b/block/bio.c -@@ -564,6 +564,7 @@ void __bio_clone_fast(struct bio *bio, s - bio->bi_opf = bio_src->bi_opf; - bio->bi_iter = bio_src->bi_iter; - bio->bi_io_vec = bio_src->bi_io_vec; -+ bio->bi_vcnt = bio_src->bi_vcnt; - - bio_clone_blkcg_association(bio, bio_src); - } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch new/patches.fixes/reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch --- old/patches.fixes/reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -From: Jeff Mahoney <[email protected]> -Subject: reiserfs: don't preallocate blocks for extended attributes -References: bsc#990682 -Patch-mainline: Submitted, 22 Jun 2017 - -Most extended attributes will fit in a single block. More importantly, -we drop the reference to the inode while holding the transaction open -so the preallocated blocks aren't released. As a result, the inode -may be evicted before it's removed from the transaction's prealloc list -which can cause memory corruption. - -Signed-off-by: Jeff Mahoney <[email protected]> ---- - fs/reiserfs/bitmap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/fs/reiserfs/bitmap.c -+++ b/fs/reiserfs/bitmap.c -@@ -980,7 +980,7 @@ static int determine_prealloc_size(reise - hint->prealloc_size = 0; - - if (!hint->formatted_node && hint->preallocate) { -- if (S_ISREG(hint->inode->i_mode) -+ if (S_ISREG(hint->inode->i_mode) && !IS_PRIVATE(hint->inode) - && hint->inode->i_size >= - REISERFS_SB(hint->th->t_super)->s_alloc_options. - preallocmin * hint->inode->i_sb->s_blocksize) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/reiserfs-fix-race-in-prealloc-discard.patch new/patches.fixes/reiserfs-fix-race-in-prealloc-discard.patch --- old/patches.fixes/reiserfs-fix-race-in-prealloc-discard.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/reiserfs-fix-race-in-prealloc-discard.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -From: Jeff Mahoney <[email protected]> -Subject: reiserfs: fix race in prealloc discard -References: bsc#987576 -Patch-mainline: Submitted, reiserfs-devel 13 Jan 2017 - -The main loop in __discard_prealloc is protected by the reiserfs write lock -which is dropped across schedules like the BKL it replaced. The problem is -that it checks the value, calls a routine that schedules, and then adjusts -the state. As a result, two threads that are calling -reiserfs_prealloc_discard at the same time can race when one calls -reiserfs_free_prealloc_block, the lock is dropped, and the other calls -reiserfs_free_prealloc_block with the same block number. In the right -circumstances, it can cause the prealloc count to go negative. - -Signed-off-by: Jeff Mahoney <[email protected]> ---- - - bitmap.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - ---- a/fs/reiserfs/bitmap.c -+++ b/fs/reiserfs/bitmap.c -@@ -479,9 +479,17 @@ static void __discard_prealloc(struct re - "inode has negative prealloc blocks count."); - #endif - while (ei->i_prealloc_count > 0) { -- reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block); -- ei->i_prealloc_block++; -+ b_blocknr_t block_to_free; -+ -+ /* -+ * reiserfs_free_prealloc_block can drop the write lock, -+ * which could allow another caller to free the same block. -+ * We can protect against it by modifying the prealloc -+ * state before calling it. -+ */ -+ block_to_free = ei->i_prealloc_block++; - ei->i_prealloc_count--; -+ reiserfs_free_prealloc_block(th, inode, block_to_free); - dirty = 1; - } - if (dirty) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/scsi-ibmvscsi-module_alias.patch new/patches.fixes/scsi-ibmvscsi-module_alias.patch --- old/patches.fixes/scsi-ibmvscsi-module_alias.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/scsi-ibmvscsi-module_alias.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -Subject: map scsi proc_name to module name -From: [email protected] -References: 459933 - LTC50724 -Patch-mainline: not yet, old patch (olaf?) - ---- - drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/drivers/scsi/ibmvscsi/ibmvscsi.c -+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c -@@ -108,6 +108,9 @@ static struct scsi_transport_template *i - - #define IBMVSCSI_VERSION "1.5.9" - -+#define IBMVSCSI_PROC_NAME "ibmvscsi" -+/* The driver is named ibmvscsic, map ibmvscsi to module name */ -+MODULE_ALIAS(IBMVSCSI_PROC_NAME); - MODULE_DESCRIPTION("IBM Virtual SCSI"); - MODULE_AUTHOR("Dave Boutcher"); - MODULE_LICENSE("GPL"); -@@ -1802,7 +1805,7 @@ static struct device_attribute *ibmvscsi - static struct scsi_host_template driver_template = { - .module = THIS_MODULE, - .name = "IBM POWER Virtual SCSI Adapter " IBMVSCSI_VERSION, -- .proc_name = "ibmvscsi", -+ .proc_name = IBMVSCSI_PROC_NAME, - .queuecommand = ibmvscsi_queuecommand, - .eh_timed_out = srp_timed_out, - .eh_abort_handler = ibmvscsi_eh_abort_handler, -@@ -2069,7 +2072,7 @@ static struct vio_driver ibmvscsi_driver - .probe = ibmvscsi_probe, - .remove = ibmvscsi_remove, - .get_desired_dma = ibmvscsi_get_desired_dma, -- .name = "ibmvscsi", -+ .name = IBMVSCSI_PROC_NAME, - .pm = &ibmvscsi_pm_ops, - }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/tty-handle-the-case-where-we-cannot-restore-a-line-d.patch new/patches.fixes/tty-handle-the-case-where-we-cannot-restore-a-line-d.patch --- old/patches.fixes/tty-handle-the-case-where-we-cannot-restore-a-line-d.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/tty-handle-the-case-where-we-cannot-restore-a-line-d.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,200 +0,0 @@ -From: Alan Cox <[email protected]> -Date: Fri, 2 Jun 2017 13:49:30 +0100 -Subject: tty: handle the case where we cannot restore a line discipline -Patch-mainline: v4.13-rc1 -Git-commit: 8a8dabf2dd68caff842d38057097c23bc514ea6e -References: bnc#1042878 - -Historically the N_TTY driver could never fail but this has become broken over -time. Rather than trying to rewrite half the ldisc layer to fix the breakage -introduce a second level of fallback with an N_NULL ldisc which cannot fail, -and thus restore the guarantees required by the ldisc layer. - -We still try and fail to N_TTY first. It's much more useful to find yourself -back in your old ldisc (first attempt) or in N_TTY (second attempt), and while -I'm not aware of any code out there that makes those assumptions it's good to -drive(r) defensively. - -Signed-off-by: Alan Cox <[email protected]> -Reported-by: Dmitry Vyukov <[email protected]> -Tested-by: Dmitry Vyukov <[email protected]> -Signed-off-by: Greg Kroah-Hartman <[email protected]> -Signed-off-by: Jiri Slaby <[email protected]> ---- - drivers/tty/Makefile | 3 + - drivers/tty/n_null.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ - drivers/tty/tty_ldisc.c | 44 +++++++++++++++++-------- - include/uapi/linux/tty.h | 1 - 4 files changed, 113 insertions(+), 15 deletions(-) - create mode 100644 drivers/tty/n_null.c - ---- a/drivers/tty/Makefile -+++ b/drivers/tty/Makefile -@@ -1,6 +1,7 @@ - obj-$(CONFIG_TTY) += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ - tty_buffer.o tty_port.o tty_mutex.o \ -- tty_ldsem.o tty_baudrate.o tty_jobctrl.o -+ tty_ldsem.o tty_baudrate.o tty_jobctrl.o \ -+ n_null.o - obj-$(CONFIG_LEGACY_PTYS) += pty.o - obj-$(CONFIG_UNIX98_PTYS) += pty.o - obj-$(CONFIG_AUDIT) += tty_audit.o ---- /dev/null -+++ b/drivers/tty/n_null.c -@@ -0,0 +1,80 @@ -+#include <linux/types.h> -+#include <linux/errno.h> -+#include <linux/tty.h> -+#include <linux/module.h> -+ -+/* -+ * n_null.c - Null line discipline used in the failure path -+ * -+ * Copyright (C) Intel 2017 -+ * -+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 -+ * as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+ */ -+ -+static int n_null_open(struct tty_struct *tty) -+{ -+ return 0; -+} -+ -+static void n_null_close(struct tty_struct *tty) -+{ -+} -+ -+static ssize_t n_null_read(struct tty_struct *tty, struct file *file, -+ unsigned char __user * buf, size_t nr) -+{ -+ return -EOPNOTSUPP; -+} -+ -+static ssize_t n_null_write(struct tty_struct *tty, struct file *file, -+ const unsigned char *buf, size_t nr) -+{ -+ return -EOPNOTSUPP; -+} -+ -+static void n_null_receivebuf(struct tty_struct *tty, -+ const unsigned char *cp, char *fp, -+ int cnt) -+{ -+} -+ -+static struct tty_ldisc_ops null_ldisc = { -+ .owner = THIS_MODULE, -+ .magic = TTY_LDISC_MAGIC, -+ .name = "n_null", -+ .open = n_null_open, -+ .close = n_null_close, -+ .read = n_null_read, -+ .write = n_null_write, -+ .receive_buf = n_null_receivebuf -+}; -+ -+static int __init n_null_init(void) -+{ -+ BUG_ON(tty_register_ldisc(N_NULL, &null_ldisc)); -+ return 0; -+} -+ -+static void __exit n_null_exit(void) -+{ -+ tty_unregister_ldisc(N_NULL); -+} -+ -+module_init(n_null_init); -+module_exit(n_null_exit); -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Alan Cox"); -+MODULE_ALIAS_LDISC(N_NULL); -+MODULE_DESCRIPTION("Null ldisc driver"); ---- a/drivers/tty/tty_ldisc.c -+++ b/drivers/tty/tty_ldisc.c -@@ -492,6 +492,29 @@ static void tty_ldisc_close(struct tty_s - } - - /** -+ * tty_ldisc_failto - helper for ldisc failback -+ * @tty: tty to open the ldisc on -+ * @ld: ldisc we are trying to fail back to -+ * -+ * Helper to try and recover a tty when switching back to the old -+ * ldisc fails and we need something attached. -+ */ -+ -+static int tty_ldisc_failto(struct tty_struct *tty, int ld) -+{ -+ struct tty_ldisc *disc = tty_ldisc_get(tty, ld); -+ int r; -+ -+ if (IS_ERR(disc)) -+ return PTR_ERR(disc); -+ tty->ldisc = disc; -+ tty_set_termios_ldisc(tty, ld); -+ if ((r = tty_ldisc_open(tty, disc)) < 0) -+ tty_ldisc_put(disc); -+ return r; -+} -+ -+/** - * tty_ldisc_restore - helper for tty ldisc change - * @tty: tty to recover - * @old: previous ldisc -@@ -502,9 +525,6 @@ static void tty_ldisc_close(struct tty_s - - static void tty_ldisc_restore(struct tty_struct *tty, struct tty_ldisc *old) - { -- struct tty_ldisc *new_ldisc; -- int r; -- - /* There is an outstanding reference here so this is safe */ - old = tty_ldisc_get(tty, old->ops->num); - WARN_ON(IS_ERR(old)); -@@ -512,17 +532,13 @@ static void tty_ldisc_restore(struct tty - tty_set_termios_ldisc(tty, old->ops->num); - if (tty_ldisc_open(tty, old) < 0) { - tty_ldisc_put(old); -- /* This driver is always present */ -- new_ldisc = tty_ldisc_get(tty, N_TTY); -- if (IS_ERR(new_ldisc)) -- panic("n_tty: get"); -- tty->ldisc = new_ldisc; -- tty_set_termios_ldisc(tty, N_TTY); -- r = tty_ldisc_open(tty, new_ldisc); -- if (r < 0) -- panic("Couldn't open N_TTY ldisc for " -- "%s --- error %d.", -- tty_name(tty), r); -+ /* The traditional behaviour is to fall back to N_TTY, we -+ want to avoid falling back to N_NULL unless we have no -+ choice to avoid the risk of breaking anything */ -+ if (tty_ldisc_failto(tty, N_TTY) < 0 && -+ tty_ldisc_failto(tty, N_NULL) < 0) -+ panic("Couldn't open N_NULL ldisc for %s.", -+ tty_name(tty)); - } - } - ---- a/include/uapi/linux/tty.h -+++ b/include/uapi/linux/tty.h -@@ -35,5 +35,6 @@ - #define N_TRACESINK 23 /* Trace data routing for MIPI P1149.7 */ - #define N_TRACEROUTER 24 /* Trace data routing for MIPI P1149.7 */ - #define N_NCI 25 /* NFC NCI UART */ -+#define N_NULL 27 /* Null ldisc used for error handling */ - - #endif /* _UAPI_LINUX_TTY_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/usb-early-Remove-trace_printk-callers-in-xhci-dbc.patch new/patches.fixes/usb-early-Remove-trace_printk-callers-in-xhci-dbc.patch --- old/patches.fixes/usb-early-Remove-trace_printk-callers-in-xhci-dbc.patch 2017-08-30 22:10:03.000000000 +0200 +++ new/patches.fixes/usb-early-Remove-trace_printk-callers-in-xhci-dbc.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From: Lu Baolu <[email protected]> -Date: Sat, 3 Jun 2017 17:15:06 +0800 -Subject: usb/early: Remove trace_printk() callers in xhci-dbc -Patch-mainline: Submitted - 20170603 -References: bsc#1042295 - -Trace_printk() was used to log debug messages in xhci-dbc.c where -printk() isn't feasible. As there should not be a single caller to -trace_printk() in normal kernels, replace them with empty functions. - -Cc: Vlastimil Babka <[email protected]> -Cc: Steven Rostedt <[email protected]> -Cc: Peter Zijlstra <[email protected]> -Cc: Greg Kroah-Hartman <[email protected]> -Signed-off-by: Lu Baolu <[email protected]> -Acked-by: Michal Kubecek <[email protected]> ---- - drivers/usb/early/xhci-dbc.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c -index 1268818e2263..12fe70beae69 100644 ---- a/drivers/usb/early/xhci-dbc.c -+++ b/drivers/usb/early/xhci-dbc.c -@@ -32,7 +32,6 @@ - static struct xdbc_state xdbc; - static bool early_console_keep; - --#define XDBC_TRACE - #ifdef XDBC_TRACE - #define xdbc_trace trace_printk - #else --- -2.13.1 - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 29426 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ ++++ 6971 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:20.858014220 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:20.858014220 +0200 @@ -27,17 +27,7 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-4.12.1 - patches.kernel.org/patch-4.12.1-2 - patches.kernel.org/patch-4.12.2-3 - patches.kernel.org/patch-4.12.3-4 - patches.kernel.org/patch-4.12.4-5 - patches.kernel.org/patch-4.12.5-6 - patches.kernel.org/patch-4.12.6-7 - patches.kernel.org/patch-4.12.7-8 - patches.kernel.org/patch-4.12.8-9 - patches.kernel.org/patch-4.12.9-10 - patches.kernel.org/patch-4.12.10-11 + patches.kernel.org/patch-4.13.1 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -134,11 +124,6 @@ ######################################################## # powerpc/generic ######################################################## - patches.arch/ppc-pegasos-console-autodetection.patch - patches.suse/ppc-powerbook-usb-fn-key-default.patch - patches.drivers/ppc64-adb - patches.suse/suse-ppc64-branding - patches.arch/ppc-prom-nodisplay.patch ######################################################## # powerpc/little endian @@ -191,11 +176,6 @@ patches.suse/connector-read-mostly patches.suse/kbd-ignore-gfx.patch - # bsc#1027456 - fixes false positive kmemleak splat in sys_clone() - patches.suse/0001-mm-kmemleak-slightly-reduce-the-size-of-some-structu.patch - patches.suse/0002-mm-kmemleak-factor-object-reference-updating-out-of-.patch - patches.suse/0003-mm-kmemleak-treat-vm_struct-as-alternative-reference.patch - ######################################################## # # ACPI patches @@ -258,7 +238,7 @@ ######################################################## # Not upstream yet - patches.suse/btrfs-add-cond_resched-to-btrfs_qgroup_trace_leaf_items + patches.suse/uapi-add-a-compatibility-layer-between-linux-uio-h-and-glibc # SUSE-specific patches.suse/btrfs-provide-super_operations-get_inode_dev @@ -269,8 +249,6 @@ ######################################################## # Reiserfs Patches ######################################################## - patches.fixes/reiserfs-fix-race-in-prealloc-discard.patch - patches.fixes/reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch ######################################################## # dlm @@ -293,10 +271,7 @@ ######################################################## patches.drivers/pstore_disable_efi_backend_by_default.patch - patches.suse/pstore-backend-autoaction - - patches.fixes/0001-fs-fcntl-f_setown-allow-returning-error.patch - patches.fixes/0002-fs-fcntl-f_setown-avoid-undefined-behaviour.patch ++duwe patches.suse/pstore-backend-autoaction ######################################################## # Overlayfs @@ -317,7 +292,6 @@ ######################################################## # Block layer fixes - patches.fixes/block-copy-bi_vcnt-in-_bio_clone_fast patches.suse/scsi-netlink-ml patches.fixes/scsi-retry-alua-transition-in-progress @@ -333,15 +307,13 @@ # bnc#362850 patches.fixes/sd_liberal_28_sense_invalid.diff - patches.fixes/scsi-ibmvscsi-module_alias.patch - # CVE-2017-14051 patches.drivers/scsi-qla2xxx-Fix-an-integer-overflow-in-sysfs-code.patch ######################################################## # DRM/Video ######################################################## - patches.fixes/drm-amdgpu-revert-update-tile-table-for-oland-hainan.patch ++jdelvare patches.fixes/drm-amdgpu-revert-update-tile-table-for-oland-hainan.patch ######################################################## # video4linux @@ -350,7 +322,6 @@ ######################################################## # Network ######################################################## - patches.drivers/e1000e-Don-t-return-uninitialized-stats.patch ######################################################## # Wireless Networking @@ -379,7 +350,6 @@ ######################################################## # USB ######################################################## - patches.fixes/usb-early-Remove-trace_printk-callers-in-xhci-dbc.patch ######################################################## # I2C @@ -400,7 +370,6 @@ ######################################################## # Char / serial ######################################################## - patches.fixes/tty-handle-the-case-where-we-cannot-restore-a-line-d.patch ######################################################## # Other driver fixes @@ -446,7 +415,6 @@ ########################################################## patches.apparmor/apparmor-basic-networking-rules.patch - patches.apparmor/apparmor-basic-networking-rules-4.11-rc1.patch patches.apparmor/apparmor-fix-quieting-of-audit-messages-for-network-mediation.patch ######################################################## @@ -462,13 +430,6 @@ ######################################################## patches.suse/crasher.patch - # from upstream - patches.suse/0001-objtool-Move-checking-code-to-check.c.patch - patches.suse/0002-objtool-x86-Add-several-functions-and-files-to-the-o.patch - patches.suse/0003-objtool-Implement-stack-validation-2.0.patch - patches.suse/0004-objtool-Silence-warnings-for-functions-which-use-IRE.patch - patches.suse/0001-objtool-Fix-sibling-call-detection-logic.patch - # pending patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:20.894009161 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:20.894009161 +0200 @@ -1,3 +1,3 @@ -2017-09-07 09:47:10 +0200 -GIT Revision: bf7fb0889a05718e645dfc1b09e40a7641a7ade9 +2017-09-10 14:02:44 +0200 +GIT Revision: 0d725b56e7e719a5cff950788a43e664bef53cbb GIT Branch: stable ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.RURUIz/_old 2017-09-12 19:40:20.930004103 +0200 +++ /var/tmp/diff_new_pack.RURUIz/_new 2017-09-12 19:40:20.934003540 +0200 @@ -1907,7 +1907,7 @@ fs/binfmt_misc fs/btrfs/btrfs fs/cachefiles/cachefiles # CacheFiles caching backend -+external fs/cifs/cifs # VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows; supported by IBM + fs/cifs/cifs # VFS to access servers complying with the SNIA CIFS Specification e.g. Samba and Windows - fs/coda/coda fs/configfs/configfs fs/cramfs/cramfs @@ -2011,7 +2011,7 @@ fs/quota_v1 # Old quota format support fs/quota_v2 # Quota format v2 support fs/quota_tree - fs/reiserfs/reiserfs # ReiserFS journaled filesystem +- fs/reiserfs/reiserfs # ReiserFS journaled filesystem fs/romfs/romfs fs/squashfs/squashfs fs/sysv/sysv
