Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kernel-source for openSUSE:Factory
checked in at 2023-01-06 17:04:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kernel-source (Old)
and /work/SRC/openSUSE:Factory/.kernel-source.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kernel-source"
Fri Jan 6 17:04:24 2023 rev:672 rq:1055762 version:6.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes
2023-01-03 16:26:56.462081988 +0100
+++ /work/SRC/openSUSE:Factory/.kernel-source.new.1563/dtb-aarch64.changes
2023-01-06 17:04:43.523901596 +0100
@@ -1,0 +2,136 @@
+Wed Jan 4 12:03:53 CET 2023 - jsl...@suse.cz
+
+- Linux 6.1.3 (bsc#1012628).
+- eventpoll: add EPOLL_URING_WAKE poll wakeup flag (bsc#1012628).
+- eventfd: provide a eventfd_signal_mask() helper (bsc#1012628).
+- io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and
+ wakeups (bsc#1012628).
+- nvme-pci: fix doorbell buffer value endianness (bsc#1012628).
+- nvme-pci: fix mempool alloc size (bsc#1012628).
+- nvme-pci: fix page size checks (bsc#1012628).
+- ACPI: resource: do IRQ override on XMG Core 15 (bsc#1012628).
+- ACPI: resource: do IRQ override on Lenovo 14ALC7 (bsc#1012628).
+- ACPI: resource: Add Asus ExpertBook B2502 to Asus quirks
+ (bsc#1012628).
+- ACPI: video: Fix Apple GMUX backlight detection (bsc#1012628).
+- block, bfq: fix uaf for bfqq in bfq_exit_icq_bfqq (bsc#1012628).
+- ata: ahci: Fix PCS quirk application for suspend (bsc#1012628).
+- nvme: fix the NVME_CMD_EFFECTS_CSE_MASK definition
+ (bsc#1012628).
+- nvmet: don't defer passthrough commands with trivial effects
+ to the workqueue (bsc#1012628).
+- fs/ntfs3: Validate BOOT record_size (bsc#1012628).
+- fs/ntfs3: Add overflow check for attribute size (bsc#1012628).
+- fs/ntfs3: Validate data run offset (bsc#1012628).
+- fs/ntfs3: Add null pointer check to attr_load_runs_vcn
+ (bsc#1012628).
+- fs/ntfs3: Fix memory leak on ntfs_fill_super() error path
+ (bsc#1012628).
+- fs/ntfs3: Add null pointer check for inode operations
+ (bsc#1012628).
+- fs/ntfs3: Validate attribute name offset (bsc#1012628).
+- fs/ntfs3: Validate buffer length while parsing index
+ (bsc#1012628).
+- fs/ntfs3: Validate resident attribute name (bsc#1012628).
+- fs/ntfs3: Fix slab-out-of-bounds read in run_unpack
+ (bsc#1012628).
+- soundwire: dmi-quirks: add quirk variant for LAPBC710 NUC15
+ (bsc#1012628).
+- phy: sun4i-usb: Introduce port2 SIDDQ quirk (bsc#1012628).
+- phy: sun4i-usb: Add support for the H616 USB PHY (bsc#1012628).
+- fs/ntfs3: Validate index root when initialize NTFS security
+ (bsc#1012628).
+- fs/ntfs3: Use __GFP_NOWARN allocation at wnd_init()
+ (bsc#1012628).
+- fs/ntfs3: Use __GFP_NOWARN allocation at ntfs_fill_super()
+ (bsc#1012628).
+- fs/ntfs3: Delete duplicate condition in ntfs_read_mft()
+ (bsc#1012628).
+- fs/ntfs3: Fix slab-out-of-bounds in r_page (bsc#1012628).
+- objtool: Fix SEGFAULT (bsc#1012628).
+- iommu/mediatek: Fix crash on isr after kexec() (bsc#1012628).
+- powerpc/rtas: avoid device tree lookups in rtas_os_term()
+ (bsc#1012628).
+- powerpc/rtas: avoid scheduling in rtas_os_term() (bsc#1012628).
+- rtc: msc313: Fix function prototype mismatch in
+ msc313_rtc_probe() (bsc#1012628).
+- kprobes: kretprobe events missing on 2-core KVM guest
+ (bsc#1012628).
+- HID: multitouch: fix Asus ExpertBook P2 P2451FA trackpoint
+ (bsc#1012628).
+- HID: plantronics: Additional PIDs for double volume key presses
+ quirk (bsc#1012628).
+- futex: Fix futex_waitv() hrtimer debug object leak on kcalloc
+ error (bsc#1012628).
+- rtmutex: Add acquire semantics for rtmutex lock acquisition
+ slow path (bsc#1012628).
+- mm/mempolicy: fix memory leak in set_mempolicy_home_node system
+ call (bsc#1012628).
+- kmsan: export kmsan_handle_urb (bsc#1012628).
+- kmsan: include linux/vmalloc.h (bsc#1012628).
+- pstore: Properly assign mem_type property (bsc#1012628).
+- pstore/zone: Use GFP_ATOMIC to allocate zone buffer
+ (bsc#1012628).
+- hfsplus: fix bug causing custom uid and gid being unable to
+ be assigned with mount (bsc#1012628).
+- ACPI: x86: s2idle: Force AMD GUID/_REV 2 on HP Elitebook 865
+ (bsc#1012628).
+- ACPI: x86: s2idle: Stop using AMD specific codepath for
+ Rembrandt+ (bsc#1012628).
+- binfmt: Fix error return code in load_elf_fdpic_binary()
+ (bsc#1012628).
+- ovl: Use ovl mounter's fsuid and fsgid in ovl_link()
+ (bsc#1012628).
+- ovl: update ->f_iocb_flags when ovl_change_flags() modifies
+ ->f_flags (bsc#1012628).
+- ALSA: line6: correct midi status byte when receiving data from
+ podxt (bsc#1012628).
+- ALSA: line6: fix stack overflow in line6_midi_transmit
+ (bsc#1012628).
+- pnode: terminate at peers of source (bsc#1012628).
+- mfd: mt6360: Add bounds checking in Regmap read/write call-backs
+ (bsc#1012628).
+- md: fix a crash in mempool_free (bsc#1012628).
+- mm, compaction: fix fast_isolate_around() to stay within
+ boundaries (bsc#1012628).
+- f2fs: should put a page when checking the summary info
+ (bsc#1012628).
+- f2fs: allow to read node block after shutdown (bsc#1012628).
+- block: Do not reread partition table on exclusively open device
+ (bsc#1012628).
+- mmc: vub300: fix warning - do not call blocking ops when
+ !TASK_RUNNING (bsc#1012628).
+- tpm: acpi: Call acpi_put_table() to fix memory leak
+ (bsc#1012628).
+- tpm: tpm_crb: Add the missed acpi_put_table() to fix memory leak
+ (bsc#1012628).
+- tpm: tpm_tis: Add the missed acpi_put_table() to fix memory leak
+ (bsc#1012628).
+- SUNRPC: Don't leak netobj memory when gss_read_proxy_verf()
+ fails (bsc#1012628).
+- kcsan: Instrument memcpy/memset/memmove with newer Clang
+ (bsc#1012628).
+- commit a5315fb
+
+-------------------------------------------------------------------
+Mon Jan 2 14:32:13 CET 2023 - ti...@suse.de
+
+- Enable Qualcomm soundwire stuff on armv7hl/default (bsc#1206782)
+- commit fe2e154
+
+-------------------------------------------------------------------
+Mon Jan 2 13:36:17 CET 2023 - jsl...@suse.cz
+
+- mm, mremap: fix mremap() expanding vma with addr inside vma
+ (bsc#1206359).
+ Update upstream status.
+- commit 05f50ad
+
+-------------------------------------------------------------------
+Mon Jan 2 13:33:38 CET 2023 - jsl...@suse.cz
+
+- Refresh patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch.
+ Update upstream status.
+- commit c14f878
+
+-------------------------------------------------------------------
dtb-armv6l.changes: same change
dtb-armv7l.changes: same change
dtb-riscv64.changes: same change
kernel-64kb.changes: same change
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-docs.changes: same change
kernel-kvmsmall.changes: same change
kernel-lpae.changes: same change
kernel-obs-build.changes: same change
kernel-obs-qa.changes: same change
kernel-pae.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-zfcpdump.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dtb-aarch64.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.191933426 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.195933449 +0100
@@ -17,7 +17,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -29,9 +29,9 @@
%(chmod +x
%_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
Name: dtb-aarch64
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
dtb-armv6l.spec: same change
dtb-armv7l.spec: same change
dtb-riscv64.spec: same change
++++++ kernel-64kb.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.307934078 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.311934101 +0100
@@ -18,7 +18,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -111,9 +111,9 @@
Summary: Kernel with 64kb PAGE_SIZE
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -240,10 +240,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
-Provides: kernel-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides:
kernel-%build_flavor-base-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
+Provides: kernel-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
# END COMMON DEPS
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%obsolete_rebuilds %name
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.339934258 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.343934281 +0100
@@ -18,7 +18,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -111,9 +111,9 @@
Summary: A Debug Version of the Kernel
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -240,10 +240,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
-Provides: kernel-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides:
kernel-%build_flavor-base-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
+Provides: kernel-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
# END COMMON DEPS
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%ifarch ppc64
Provides: kernel-kdump = 2.6.28
Obsoletes: kernel-kdump <= 2.6.28
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.371934437 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.375934460 +0100
@@ -18,7 +18,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -111,9 +111,9 @@
Summary: The Standard Kernel
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -240,10 +240,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
-Provides: kernel-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides:
kernel-%build_flavor-base-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
+Provides: kernel-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
# END COMMON DEPS
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%ifarch %ix86
Provides: kernel-smp = 2.6.17
Obsoletes: kernel-smp <= 2.6.17
++++++ kernel-docs.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.399934595 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.403934617 +0100
@@ -17,7 +17,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -31,9 +31,9 @@
Summary: Kernel Documentation
License: GPL-2.0-only
Group: Documentation/Man
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -67,7 +67,7 @@
%endif
URL: https://www.kernel.org/
Provides: %name = %version-%source_rel
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
++++++ kernel-kvmsmall.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.423934730 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.431934775 +0100
@@ -18,7 +18,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -111,9 +111,9 @@
Summary: The Small Developer Kernel for KVM
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -240,10 +240,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
-Provides: kernel-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides:
kernel-%build_flavor-base-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
+Provides: kernel-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
# END COMMON DEPS
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%obsolete_rebuilds %name
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
kernel-lpae.spec: same change
++++++ kernel-obs-build.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.479935044 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.483935067 +0100
@@ -19,7 +19,7 @@
#!BuildIgnore: post-build-checks
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
@@ -45,7 +45,7 @@
%endif
%endif
%endif
-BuildRequires:
kernel%kernel_flavor-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+BuildRequires:
kernel%kernel_flavor-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%if 0%{?rhel_version}
BuildRequires: kernel
@@ -64,9 +64,9 @@
Summary: package kernel and initrd for OBS VM builds
License: GPL-2.0-only
Group: SLES
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
++++++ kernel-obs-qa.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.503935179 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.511935224 +0100
@@ -17,7 +17,7 @@
# needsrootforbuild
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%include %_sourcedir/kernel-spec-macros
@@ -36,9 +36,9 @@
Summary: Basic QA tests for the kernel
License: GPL-2.0-only
Group: SLES
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
++++++ kernel-pae.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.539935381 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.547935426 +0100
@@ -18,7 +18,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -111,9 +111,9 @@
Summary: Kernel with PAE Support
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -240,10 +240,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
-Provides: kernel-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides:
kernel-%build_flavor-base-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
+Provides: kernel-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
# END COMMON DEPS
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%ifarch %ix86
Provides: kernel-bigsmp = 2.6.17
Obsoletes: kernel-bigsmp <= 2.6.17
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.567935538 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.575935583 +0100
@@ -17,7 +17,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
@@ -31,9 +31,9 @@
%endif
Name: kernel-source
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -50,7 +50,7 @@
BuildRequires: sed
Requires(post): coreutils sed
Provides: %name = %version-%source_rel
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
Provides: linux
Provides: multiversion(kernel)
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.599935718 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.603935741 +0100
@@ -24,10 +24,10 @@
Summary: Kernel Symbol Versions (modversions)
License: GPL-2.0-only
Group: Development/Sources
-Version: 6.1.2
+Version: 6.1.3
%if %using_buildservice
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -52,7 +52,7 @@
%endif
Requires: pesign-obs-integration
Provides: %name = %version-%source_rel
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
Provides: multiversion(kernel)
Source: README.KSYMS
Requires: kernel-devel%variant = %version-%source_rel
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:49.631935898 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:49.635935920 +0100
@@ -18,7 +18,7 @@
%define srcversion 6.1
-%define patchversion 6.1.2
+%define patchversion 6.1.3
%define variant %{nil}
%define vanilla_only 0
%define compress_modules zstd
@@ -111,9 +111,9 @@
Summary: The Standard Kernel - without any SUSE patches
License: GPL-2.0-only
Group: System/Kernel
-Version: 6.1.2
+Version: 6.1.3
%if 0%{?is_kotd}
-Release: <RELEASE>.g7fea150
+Release: <RELEASE>.ga5315fb
%else
Release: 0
%endif
@@ -240,10 +240,10 @@
Conflicts: libc.so.6()(64bit)
%endif
Provides: kernel = %version-%source_rel
-Provides:
kernel-%build_flavor-base-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
-Provides: kernel-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides:
kernel-%build_flavor-base-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
+Provides: kernel-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
# END COMMON DEPS
-Provides: %name-srchash-7fea1503395f43e7cb9ca53b28baccb86c858246
+Provides: %name-srchash-a5315fb92e6bf66727da47e30c2686b71c690341
%obsolete_rebuilds %name
Source0:
https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
Source3: kernel-source.rpmlintrc
kernel-zfcpdump.spec: same change
++++++ config.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default
--- old/config/armv7hl/default 2023-01-01 11:46:51.000000000 +0100
+++ new/config/armv7hl/default 2023-01-02 14:33:11.000000000 +0100
@@ -2278,6 +2278,8 @@
CONFIG_REGMAP_W1=m
CONFIG_REGMAP_MMIO=y
CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SOUNDWIRE=m
+CONFIG_REGMAP_SOUNDWIRE_MBQ=m
CONFIG_REGMAP_SCCB=m
CONFIG_REGMAP_I3C=m
CONFIG_DMA_SHARED_BUFFER=y
@@ -7817,10 +7819,16 @@
CONFIG_SND_SOC_QCOM=m
CONFIG_SND_SOC_LPASS_CPU=m
+CONFIG_SND_SOC_LPASS_HDMI=m
CONFIG_SND_SOC_LPASS_PLATFORM=m
+CONFIG_SND_SOC_LPASS_CDC_DMA=m
CONFIG_SND_SOC_LPASS_IPQ806X=m
+CONFIG_SND_SOC_LPASS_APQ8016=m
+CONFIG_SND_SOC_LPASS_SC7180=m
+CONFIG_SND_SOC_LPASS_SC7280=m
CONFIG_SND_SOC_STORM=m
-# CONFIG_SND_SOC_QCOM_COMMON is not set
+CONFIG_SND_SOC_APQ8016_SBC=m
+CONFIG_SND_SOC_QCOM_COMMON=m
CONFIG_SND_SOC_QDSP6_COMMON=m
CONFIG_SND_SOC_QDSP6_CORE=m
CONFIG_SND_SOC_QDSP6_AFE=m
@@ -7836,6 +7844,12 @@
CONFIG_SND_SOC_QDSP6_PRM_LPASS_CLOCKS=m
CONFIG_SND_SOC_QDSP6_PRM=m
CONFIG_SND_SOC_QDSP6=m
+CONFIG_SND_SOC_MSM8996=m
+CONFIG_SND_SOC_SDM845=m
+CONFIG_SND_SOC_SM8250=m
+CONFIG_SND_SOC_SC8280XP=m
+CONFIG_SND_SOC_SC7180=m
+CONFIG_SND_SOC_SC7280=m
CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP_I2S=m
CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
@@ -8036,6 +8050,7 @@
CONFIG_SND_SOC_MAX98520=m
CONFIG_SND_SOC_MAX98373=m
CONFIG_SND_SOC_MAX98373_I2C=m
+CONFIG_SND_SOC_MAX98373_SDW=m
CONFIG_SND_SOC_MAX98390=m
CONFIG_SND_SOC_MAX98396=m
CONFIG_SND_SOC_MAX9860=m
@@ -8065,18 +8080,31 @@
CONFIG_SND_SOC_RT1011=m
CONFIG_SND_SOC_RT1015=m
CONFIG_SND_SOC_RT1015P=m
+CONFIG_SND_SOC_RT1308_SDW=m
+CONFIG_SND_SOC_RT1316_SDW=m
# CONFIG_SND_SOC_RT5514_SPI_BUILTIN is not set
CONFIG_SND_SOC_RT5616=m
CONFIG_SND_SOC_RT5631=m
CONFIG_SND_SOC_RT5640=m
CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5659=m
+CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_RT5677_SPI=m
CONFIG_SND_SOC_RT5682=m
CONFIG_SND_SOC_RT5682_I2C=m
+CONFIG_SND_SOC_RT5682_SDW=m
CONFIG_SND_SOC_RT5682S=m
+CONFIG_SND_SOC_RT700=m
+CONFIG_SND_SOC_RT700_SDW=m
+CONFIG_SND_SOC_RT711=m
+CONFIG_SND_SOC_RT711_SDW=m
+CONFIG_SND_SOC_RT711_SDCA_SDW=m
+CONFIG_SND_SOC_RT715=m
+CONFIG_SND_SOC_RT715_SDW=m
+CONFIG_SND_SOC_RT715_SDCA_SDW=m
CONFIG_SND_SOC_RT9120=m
+CONFIG_SND_SOC_SDW_MOCKUP=m
CONFIG_SND_SOC_SGTL5000=m
CONFIG_SND_SOC_SIGMADSP=m
CONFIG_SND_SOC_SIGMADSP_I2C=m
@@ -8128,6 +8156,8 @@
CONFIG_SND_SOC_WCD9335=m
CONFIG_SND_SOC_WCD_MBHC=m
CONFIG_SND_SOC_WCD934X=m
+CONFIG_SND_SOC_WCD938X=m
+CONFIG_SND_SOC_WCD938X_SDW=m
CONFIG_SND_SOC_WM8510=m
CONFIG_SND_SOC_WM8523=m
CONFIG_SND_SOC_WM8524=m
@@ -8157,6 +8187,8 @@
CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_WM8994=m
CONFIG_SND_SOC_WM9712=m
+CONFIG_SND_SOC_WSA881X=m
+CONFIG_SND_SOC_WSA883X=m
CONFIG_SND_SOC_ZL38060=m
CONFIG_SND_SOC_MAX9759=m
CONFIG_SND_SOC_MT6351=m
@@ -8171,6 +8203,7 @@
CONFIG_SND_SOC_NAU8822=m
CONFIG_SND_SOC_NAU8824=m
CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
@@ -10005,7 +10038,12 @@
CONFIG_RPMSG_VIRTIO=m
# end of Rpmsg drivers
-# CONFIG_SOUNDWIRE is not set
+CONFIG_SOUNDWIRE=m
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_QCOM=m
#
# SOC (System On Chip) specific Drivers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae
--- old/config/armv7hl/lpae 2023-01-01 11:46:51.000000000 +0100
+++ new/config/armv7hl/lpae 2023-01-02 14:33:11.000000000 +0100
@@ -219,8 +219,6 @@
CONFIG_RADIO_MAXIRADIO=m
CONFIG_RADIO_SI476X=m
# CONFIG_READ_ONLY_THP_FOR_FS is not set
-CONFIG_REGMAP_SOUNDWIRE=m
-CONFIG_REGMAP_SOUNDWIRE_MBQ=m
CONFIG_REGULATOR_HI6421V600=m
# CONFIG_REGULATOR_QCOM_SMD_RPM is not set
CONFIG_REGULATOR_VQMMC_IPQ4019=m
@@ -259,49 +257,20 @@
# CONFIG_SND_IMX_SOC is not set
# CONFIG_SND_KIRKWOOD_SOC is not set
# CONFIG_SND_MESON_AXG_SPDIFIN is not set
-CONFIG_SND_SOC_APQ8016_SBC=m
# CONFIG_SND_SOC_FSL_ESAI is not set
# CONFIG_SND_SOC_FSL_SAI is not set
# CONFIG_SND_SOC_FSL_SPDIF is not set
# CONFIG_SND_SOC_FSL_SSI is not set
# CONFIG_SND_SOC_IMX_AUDMUX is not set
-CONFIG_SND_SOC_LPASS_APQ8016=m
-CONFIG_SND_SOC_LPASS_CDC_DMA=m
-CONFIG_SND_SOC_LPASS_HDMI=m
-CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
-CONFIG_SND_SOC_LPASS_SC7180=m
-CONFIG_SND_SOC_LPASS_SC7280=m
-CONFIG_SND_SOC_MAX98373_SDW=m
-CONFIG_SND_SOC_MSM8996=m
-CONFIG_SND_SOC_QCOM_COMMON=m
-CONFIG_SND_SOC_RT1308_SDW=m
-CONFIG_SND_SOC_RT1316_SDW=m
-CONFIG_SND_SOC_RT5682_SDW=m
-CONFIG_SND_SOC_RT700=m
-CONFIG_SND_SOC_RT700_SDW=m
-CONFIG_SND_SOC_RT711=m
-CONFIG_SND_SOC_RT711_SDCA_SDW=m
-CONFIG_SND_SOC_RT711_SDW=m
-CONFIG_SND_SOC_RT715=m
-CONFIG_SND_SOC_RT715_SDCA_SDW=m
-CONFIG_SND_SOC_RT715_SDW=m
-CONFIG_SND_SOC_SC7180=m
-CONFIG_SND_SOC_SC7280=m
# CONFIG_SND_SOC_SC8280XP is not set
# CONFIG_SND_SOC_SDM845 is not set
-CONFIG_SND_SOC_SDW_MOCKUP=m
CONFIG_SND_SOC_SI476X=m
-CONFIG_SND_SOC_SM8250=m
# CONFIG_SND_SOC_TEGRA20_I2S is not set
# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
# CONFIG_SND_SOC_TEGRA30_AHUB is not set
# CONFIG_SND_SOC_TEGRA30_I2S is not set
# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set
CONFIG_SND_SOC_TLV320ADC3XXX=m
-CONFIG_SND_SOC_WCD938X=m
-CONFIG_SND_SOC_WCD938X_SDW=m
-CONFIG_SND_SOC_WSA881X=m
-CONFIG_SND_SOC_WSA883X=m
# CONFIG_SND_SUN4I_I2S is not set
# CONFIG_SND_SUN4I_SPDIF is not set
CONFIG_SND_VIRTIO=m
@@ -316,8 +285,6 @@
# CONFIG_SOC_IMX6SX is not set
# CONFIG_SOC_IMX6UL is not set
# CONFIG_SOC_VF610 is not set
-CONFIG_SOUNDWIRE=m
-CONFIG_SOUNDWIRE_QCOM=m
# CONFIG_SPI_ALTERA is not set
# CONFIG_SPI_ALTERA_DFL is not set
# CONFIG_SPI_AXI_SPI_ENGINE is not set
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 7000 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/ALSA-hda-hdmi-Static-PCM-mapping-again-with-AMD-HDMI.patch
new/patches.suse/ALSA-hda-hdmi-Static-PCM-mapping-again-with-AMD-HDMI.patch
--- old/patches.suse/ALSA-hda-hdmi-Static-PCM-mapping-again-with-AMD-HDMI.patch
2023-01-01 11:46:51.000000000 +0100
+++ new/patches.suse/ALSA-hda-hdmi-Static-PCM-mapping-again-with-AMD-HDMI.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,118 +0,0 @@
-From 090ddad4c7a9fefd647c762093a555870a19c8b2 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <ti...@suse.de>
-Date: Wed, 28 Dec 2022 13:57:14 +0100
-Subject: [PATCH] ALSA: hda/hdmi: Static PCM mapping again with AMD HDMI codecs
-Git-commit: 090ddad4c7a9fefd647c762093a555870a19c8b2
-Patch-mainline: v6.2-rc2
-References: bsc#1206759
-
-The recent code refactoring for HD-audio HDMI codec driver caused a
-regression on AMD/ATI HDMI codecs; namely, PulseAudioand pipewire
-don't recognize HDMI outputs any longer while the direct output via
-ALSA raw access still works.
-
-The problem turned out that, after the code refactoring, the driver
-assumes only the dynamic PCM assignment, and when a PCM stream that
-still isn't assigned to any pin gets opened, the driver tries to
-assign any free converter to the PCM stream. This behavior is OK for
-Intel and other codecs, as they have arbitrary connections between
-pins and converters. OTOH, on AMD chips that have a 1:1 mapping
-between pins and converters, this may end up with blocking the open of
-the next PCM stream for the pin that is tied with the formerly taken
-converter.
-
-Also, with the code refactoring, more PCM streams are exposed than
-necessary as we assume all converters can be used, while this isn't
-true for AMD case. This may change the PCM stream assignment and
-confuse users as well.
-
-This patch fixes those problems by:
-
-- Introducing a flag spec->static_pcm_mapping, and if it's set, the
- driver applies the static mapping between pins and converters at the
- probe time
-- Limiting the number of PCM streams per pins, too; this avoids the
- superfluous PCM streams
-
-Fixes: ef6f5494faf6 ("ALSA: hda/hdmi: Use only dynamic PCM device allocation")
-Cc: <sta...@vger.kernel.org>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=216836
-Co-developed-by: Jaroslav Kysela <pe...@perex.cz>
-Signed-off-by: Jaroslav Kysela <pe...@perex.cz>
-Link: https://lore.kernel.org/r/20221228125714.16329-1-ti...@suse.de
-Signed-off-by: Takashi Iwai <ti...@suse.de>
-
----
- sound/pci/hda/patch_hdmi.c | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 8015e4471267..386dd9d9143f 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -167,6 +167,7 @@ struct hdmi_spec {
- struct hdmi_ops ops;
-
- bool dyn_pin_out;
-+ bool static_pcm_mapping;
- /* hdmi interrupt trigger control flag for Nvidia codec */
- bool hdmi_intr_trig_ctrl;
- bool nv_dp_workaround; /* workaround DP audio infoframe for Nvidia */
-@@ -1525,13 +1526,16 @@ static void update_eld(struct hda_codec *codec,
- */
- pcm_jack = pin_idx_to_pcm_jack(codec, per_pin);
-
-- if (eld->eld_valid) {
-- hdmi_attach_hda_pcm(spec, per_pin);
-- hdmi_pcm_setup_pin(spec, per_pin);
-- } else {
-- hdmi_pcm_reset_pin(spec, per_pin);
-- hdmi_detach_hda_pcm(spec, per_pin);
-+ if (!spec->static_pcm_mapping) {
-+ if (eld->eld_valid) {
-+ hdmi_attach_hda_pcm(spec, per_pin);
-+ hdmi_pcm_setup_pin(spec, per_pin);
-+ } else {
-+ hdmi_pcm_reset_pin(spec, per_pin);
-+ hdmi_detach_hda_pcm(spec, per_pin);
-+ }
- }
-+
- /* if pcm_idx == -1, it means this is in monitor connection event
- * we can get the correct pcm_idx now.
- */
-@@ -2281,8 +2285,8 @@ static int generic_hdmi_build_pcms(struct hda_codec
*codec)
- struct hdmi_spec *spec = codec->spec;
- int idx, pcm_num;
-
-- /* limit the PCM devices to the codec converters */
-- pcm_num = spec->num_cvts;
-+ /* limit the PCM devices to the codec converters or available PINs */
-+ pcm_num = min(spec->num_cvts, spec->num_pins);
- codec_dbg(codec, "hdmi: pcm_num set to %d\n", pcm_num);
-
- for (idx = 0; idx < pcm_num; idx++) {
-@@ -2379,6 +2383,11 @@ static int generic_hdmi_build_controls(struct hda_codec
*codec)
- struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
- struct hdmi_eld *pin_eld = &per_pin->sink_eld;
-
-+ if (spec->static_pcm_mapping) {
-+ hdmi_attach_hda_pcm(spec, per_pin);
-+ hdmi_pcm_setup_pin(spec, per_pin);
-+ }
-+
- pin_eld->eld_valid = false;
- hdmi_present_sense(per_pin, 0);
- }
-@@ -4419,6 +4428,8 @@ static int patch_atihdmi(struct hda_codec *codec)
-
- spec = codec->spec;
-
-+ spec->static_pcm_mapping = true;
-+
- spec->ops.pin_get_eld = atihdmi_pin_get_eld;
- spec->ops.pin_setup_infoframe = atihdmi_pin_setup_infoframe;
- spec->ops.pin_hbr_setup = atihdmi_pin_hbr_setup;
---
-2.35.3
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch
new/patches.suse/NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch
--- old/patches.suse/NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch
2023-01-01 11:46:51.000000000 +0100
+++ new/patches.suse/NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,80 +0,0 @@
-From: Dai Ngo <dai....@oracle.com>
-Date: Mon, 12 Dec 2022 14:50:11 -0800
-Subject: [PATCH] NFSD: fix use-after-free in __nfs42_ssc_open()
-Git-commit: 75333d48f92256a0dec91dbf07835e804fc411c0
-Patch-mainline: v6.2-rc1
-References: bsc#1206209 CVE-2022-4379
-
-Problem caused by source's vfsmount being unmounted but remains
-on the delayed unmount list. This happens when nfs42_ssc_open()
-return errors.
-
-Fixed by removing nfsd4_interssc_connect(), leave the vfsmount
-for the laundromat to unmount when idle time expires.
-
-We don't need to call nfs_do_sb_deactive when nfs42_ssc_open
-return errors since the file was not opened so nfs_server->active
-was not incremented. Same as in nfsd4_copy, if we fail to
-launch nfsd4_do_async_copy thread then there's no need to
-call nfs_do_sb_deactive
-
-Reported-by: Xingyuan Mo <hdth...@gmail.com>
-Signed-off-by: Dai Ngo <dai....@oracle.com>
-Tested-by: Xingyuan Mo <hdth...@gmail.com>
-Signed-off-by: Chuck Lever <chuck.le...@oracle.com>
-Acked-by: NeilBrown <ne...@suse.com>
-
----
- fs/nfsd/nfs4proc.c | 20 +++++---------------
- 1 file changed, 5 insertions(+), 15 deletions(-)
-
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -1463,13 +1463,6 @@ out_err:
- return status;
- }
-
--static void
--nfsd4_interssc_disconnect(struct vfsmount *ss_mnt)
--{
-- nfs_do_sb_deactive(ss_mnt->mnt_sb);
-- mntput(ss_mnt);
--}
--
- /*
- * Verify COPY destination stateid.
- *
-@@ -1572,11 +1565,6 @@ nfsd4_cleanup_inter_ssc(struct vfsmount
- {
- }
-
--static void
--nfsd4_interssc_disconnect(struct vfsmount *ss_mnt)
--{
--}
--
- static struct file *nfs42_ssc_open(struct vfsmount *ss_mnt,
- struct nfs_fh *src_fh,
- nfs4_stateid *stateid)
-@@ -1771,7 +1759,7 @@ static int nfsd4_do_async_copy(void *dat
- default:
- nfserr = nfserr_offload_denied;
- }
-- nfsd4_interssc_disconnect(copy->ss_mnt);
-+ /* ss_mnt will be unmounted by the laundromat */
- goto do_callback;
- }
- nfserr = nfsd4_do_copy(copy, filp, copy->nf_dst->nf_file,
-@@ -1852,8 +1840,10 @@ out_err:
- if (async_copy)
- cleanup_async_copy(async_copy);
- status = nfserrno(-ENOMEM);
-- if (nfsd4_ssc_is_inter(copy))
-- nfsd4_interssc_disconnect(copy->ss_mnt);
-+ /*
-+ * source's vfsmount of inter-copy will be unmounted
-+ * by the laundromat
-+ */
- goto out;
- }
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/mm-mremap-fix-mremap-expanding-vma-with-addr-inside-.patch
new/patches.suse/mm-mremap-fix-mremap-expanding-vma-with-addr-inside-.patch
--- old/patches.suse/mm-mremap-fix-mremap-expanding-vma-with-addr-inside-.patch
2023-01-01 11:46:51.000000000 +0100
+++ new/patches.suse/mm-mremap-fix-mremap-expanding-vma-with-addr-inside-.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-From c2b708aa5ac35fe712c53bc07795147c81a572be Mon Sep 17 00:00:00 2001
-From: Vlastimil Babka <vba...@suse.cz>
-Date: Fri, 16 Dec 2022 16:30:45 +0100
-Subject: [PATCH for v6.1 regression] mm, mremap: fix mremap() expanding vma
with addr inside vma
-Patch-mainline: Submitted,
https://lore.kernel.org/all/20221216163227.24648-1-vba...@suse.cz/T/#u
-References: bsc#1206359
-
-Since 6.1 we have noticed random rpm install failures that were tracked
-to mremap() returning -ENOMEM and to commit ca3d76b0aa80 ("mm: add
-merging after mremap resize").
-
-The problem occurs when mremap() expands a VMA in place, but using an
-starting address that's not vma->vm_start, but somewhere in the middle.
-The extension_pgoff calculation introduced by the commit is wrong in
-that case, so vma_merge() fails due to pgoffs not being compatible.
-Fix the calculation.
-
-By the way it seems that the situations, where rpm now expands a vma
-from the middle, were made possible also due to that commit, thanks to
-the improved vma merging. Yet it should work just fine, except for the
-buggy calculation.
-
-Reported-by: Jiri Slaby <jirisl...@kernel.org>
-Link: https://bugzilla.suse.com/show_bug.cgi?id=1206359
-Fixes: ca3d76b0aa80 ("mm: add merging after mremap resize")
-Signed-off-by: Vlastimil Babka <vba...@suse.cz>
-Cc: Jakub MatÄna <matenaja...@gmail.com>
-Cc: <sta...@vger.kernel.org>
-Cc: "Kirill A . Shutemov" <kir...@shutemov.name>
-Cc: Liam Howlett <liam.howl...@oracle.com>
-Cc: Matthew Wilcox <wi...@infradead.org>
-Cc: Mel Gorman <mgor...@techsingularity.net>
-Cc: Michal Hocko <mho...@kernel.org>
----
- mm/mremap.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/mm/mremap.c
-+++ b/mm/mremap.c
-@@ -1016,7 +1016,8 @@ SYSCALL_DEFINE5(mremap, unsigned long, a
- long pages = (new_len - old_len) >> PAGE_SHIFT;
- unsigned long extension_start = addr + old_len;
- unsigned long extension_end = addr + new_len;
-- pgoff_t extension_pgoff = vma->vm_pgoff + (old_len >>
PAGE_SHIFT);
-+ pgoff_t extension_pgoff = vma->vm_pgoff +
-+ ((extension_start - vma->vm_start) >>
PAGE_SHIFT);
-
- if (vma->vm_flags & VM_ACCOUNT) {
- if (security_vm_enough_memory_mm(mm, pages)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch
new/patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch
--- old/patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch 2023-01-01
11:46:51.000000000 +0100
+++ new/patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch 2023-01-04
12:03:53.000000000 +0100
@@ -1,7 +1,9 @@
From: Kuniyuki Iwashima <kun...@amazon.com>
-Date: Thu, 22 Dec 2022 00:12:57 +0900
+Date: Mon, 26 Dec 2022 22:27:52 +0900
Subject: tcp: Add TIME_WAIT sockets in bhash2.
-Patch-mainline: Submitted 20221221151258.25748-2-kun...@amazon.com
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git
+Git-commit: 936a192f974018b4f6040f6f77b1cc1e75bd8666
+Patch-mainline: Queued in subsystem maintainer repository
References: bsc#1206466
Jiri Slaby reported regression of bind() with a simple repro. [0]
@@ -15,82 +17,129 @@
inet_bhash2_conflict() misses TIME_WAIT sockets when validating bind()
requests if the address is not a wildcard one.
+The straight option is to move sk_bind2_node from struct sock to struct
+sock_common to add twsk to bhash2 as implemented as RFC. [1] However, the
+binary layout change in the struct sock could affect performances moving
+hot fields on different cachelines.
+
+To avoid that, we add another TIME_WAIT list in inet_bind2_bucket and check
+it while validating bind().
+
[0]:
https://lore.kernel.org/netdev/6b971a4e-c7d8-411e-1f92-fda29b5b2...@kernel.org/
+[1]: https://lore.kernel.org/netdev/20221221151258.25748-2-kun...@amazon.com/
Fixes: 28044fc1d495 ("net: Add a bhash2 table hashed by port and address")
Reported-by: Jiri Slaby <jirisl...@kernel.org>
+Suggested-by: Paolo Abeni <pab...@redhat.com>
Signed-off-by: Kuniyuki Iwashima <kun...@amazon.com>
+Acked-by: Joanne Koong <joannelko...@gmail.com>
+Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
- include/net/inet_timewait_sock.h | 2 ++
- include/net/sock.h | 5 +++--
- net/ipv4/inet_hashtables.c | 5 +++--
+ include/net/inet_hashtables.h | 4 ++++
+ include/net/inet_timewait_sock.h | 5 +++++
+ net/ipv4/inet_connection_sock.c | 26 ++++++++++++++++++++++----
+ net/ipv4/inet_hashtables.c | 8 +++++---
net/ipv4/inet_timewait_sock.c | 31 +++++++++++++++++++++++++++++--
- 4 files changed, 37 insertions(+), 6 deletions(-)
+ 5 files changed, 65 insertions(+), 9 deletions(-)
+--- a/include/net/inet_hashtables.h
++++ b/include/net/inet_hashtables.h
+@@ -108,6 +108,10 @@ struct inet_bind2_bucket {
+ struct hlist_node node;
+ /* List of sockets hashed to this bucket */
+ struct hlist_head owners;
++ /* bhash has twsk in owners, but bhash2 has twsk in
++ * deathrow not to add a member in struct sock_common.
++ */
++ struct hlist_head deathrow;
+ };
+
+ static inline struct net *ib_net(const struct inet_bind_bucket *ib)
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
-@@ -44,6 +44,7 @@ struct inet_timewait_sock {
- #define tw_bound_dev_if __tw_common.skc_bound_dev_if
- #define tw_node __tw_common.skc_nulls_node
- #define tw_bind_node __tw_common.skc_bind_node
-+#define tw_bind2_node __tw_common.skc_bind2_node
- #define tw_refcnt __tw_common.skc_refcnt
- #define tw_hash __tw_common.skc_hash
- #define tw_prot __tw_common.skc_prot
-@@ -73,6 +74,7 @@ struct inet_timewait_sock {
+@@ -73,9 +73,14 @@ struct inet_timewait_sock {
u32 tw_priority;
struct timer_list tw_timer;
struct inet_bind_bucket *tw_tb;
+ struct inet_bind2_bucket *tw_tb2;
++ struct hlist_node tw_bind2_node;
};
#define tw_tclass tw_tos
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -156,6 +156,7 @@ typedef __u64 __bitwise __addrpair;
- * @skc_tw_rcv_nxt: (aka tw_rcv_nxt) TCP window next expected seq number
- * [union with @skc_incoming_cpu]
- * @skc_refcnt: reference count
-+ * @skc_bind2_node: bind node in the bhash2 table
- *
- * This is the minimal network layer representation of sockets, the header
- * for struct sock and struct inet_timewait_sock.
-@@ -241,6 +242,7 @@ struct sock_common {
- u32 skc_window_clamp;
- u32 skc_tw_snd_nxt; /* struct tcp_timewait_sock */
- };
-+ struct hlist_node skc_bind2_node;
- /* public: */
- };
++#define twsk_for_each_bound_bhash2(__tw, list) \
++ hlist_for_each_entry(__tw, list, tw_bind2_node)
++
+ static inline struct inet_timewait_sock *inet_twsk(const struct sock *sk)
+ {
+ return (struct inet_timewait_sock *)sk;
+--- a/net/ipv4/inet_connection_sock.c
++++ b/net/ipv4/inet_connection_sock.c
+@@ -173,22 +173,40 @@ static bool inet_bind_conflict(const str
+ return false;
+ }
-@@ -348,7 +350,6 @@ struct sk_filter;
- * @sk_txtime_report_errors: set report errors mode for SO_TXTIME
- * @sk_txtime_unused: unused txtime flags
- * @ns_tracker: tracker for netns reference
-- * @sk_bind2_node: bind node in the bhash2 table
- */
- struct sock {
- /*
-@@ -381,6 +382,7 @@ struct sock {
- #define sk_net_refcnt __sk_common.skc_net_refcnt
- #define sk_bound_dev_if __sk_common.skc_bound_dev_if
- #define sk_bind_node __sk_common.skc_bind_node
-+#define sk_bind2_node __sk_common.skc_bind2_node
- #define sk_prot __sk_common.skc_prot
- #define sk_net __sk_common.skc_net
- #define sk_v6_daddr __sk_common.skc_v6_daddr
-@@ -538,7 +540,6 @@ struct sock {
- #endif
- struct rcu_head sk_rcu;
- netns_tracker ns_tracker;
-- struct hlist_node sk_bind2_node;
- };
++static bool __inet_bhash2_conflict(const struct sock *sk, struct sock *sk2,
++ kuid_t sk_uid, bool relax,
++ bool reuseport_cb_ok, bool reuseport_ok)
++{
++ if (sk->sk_family == AF_INET && ipv6_only_sock(sk2))
++ return false;
++
++ return inet_bind_conflict(sk, sk2, sk_uid, relax,
++ reuseport_cb_ok, reuseport_ok);
++}
++
+ static bool inet_bhash2_conflict(const struct sock *sk,
+ const struct inet_bind2_bucket *tb2,
+ kuid_t sk_uid,
+ bool relax, bool reuseport_cb_ok,
+ bool reuseport_ok)
+ {
++ struct inet_timewait_sock *tw2;
+ struct sock *sk2;
+
+ sk_for_each_bound_bhash2(sk2, &tb2->owners) {
+- if (sk->sk_family == AF_INET && ipv6_only_sock(sk2))
+- continue;
++ if (__inet_bhash2_conflict(sk, sk2, sk_uid, relax,
++ reuseport_cb_ok, reuseport_ok))
++ return true;
++ }
+
+- if (inet_bind_conflict(sk, sk2, sk_uid, relax,
+- reuseport_cb_ok, reuseport_ok))
++ twsk_for_each_bound_bhash2(tw2, &tb2->deathrow) {
++ sk2 = (struct sock *)tw2;
++
++ if (__inet_bhash2_conflict(sk, sk2, sk_uid, relax,
++ reuseport_cb_ok, reuseport_ok))
+ return true;
+ }
++
+ return false;
+ }
- enum sk_pacing {
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
-@@ -1103,15 +1103,16 @@ ok:
+@@ -116,6 +116,7 @@ static void inet_bind2_bucket_init(struc
+ #endif
+ tb->rcv_saddr = sk->sk_rcv_saddr;
+ INIT_HLIST_HEAD(&tb->owners);
++ INIT_HLIST_HEAD(&tb->deathrow);
+ hlist_add_head(&tb->node, &head->chain);
+ }
+
+@@ -137,7 +138,7 @@ struct inet_bind2_bucket *inet_bind2_buc
+ /* Caller must hold hashbucket lock for this tb with local BH disabled */
+ void inet_bind2_bucket_destroy(struct kmem_cache *cachep, struct
inet_bind2_bucket *tb)
+ {
+- if (hlist_empty(&tb->owners)) {
++ if (hlist_empty(&tb->owners) && hlist_empty(&tb->deathrow)) {
+ __hlist_del(&tb->node);
+ kmem_cache_free(cachep, tb);
+ }
+@@ -1103,15 +1104,16 @@ ok:
/* Head lock still held and bh's disabled */
inet_bind_hash(sk, tb, tb2, port);
@@ -191,7 +240,7 @@
+
+ tw->tw_tb2 = icsk->icsk_bind2_hash;
+ WARN_ON(!icsk->icsk_bind2_hash);
-+ inet_twsk_add_bind2_node(tw, &tw->tw_tb2->owners);
++ inet_twsk_add_bind2_node(tw, &tw->tw_tb2->deathrow);
+
+ spin_unlock(&bhead2->lock);
spin_unlock(&bhead->lock);
++++++ series.conf ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:52.691953083 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:52.699953128 +0100
@@ -1191,6 +1191,78 @@
patches.kernel.org/6.1.2-1137-mfd-qcom_rpm-Use-devm_of_platform_populate-to-.patch
patches.kernel.org/6.1.2-1138-pwm-tegra-Fix-32-bit-build.patch
patches.kernel.org/6.1.2-1139-Linux-6.1.2.patch
+
patches.kernel.org/6.1.3-001-eventpoll-add-EPOLL_URING_WAKE-poll-wakeup-flag.patch
+
patches.kernel.org/6.1.3-002-eventfd-provide-a-eventfd_signal_mask-helper.patch
+
patches.kernel.org/6.1.3-003-io_uring-pass-in-EPOLL_URING_WAKE-for-eventfd-s.patch
+
patches.kernel.org/6.1.3-004-nvme-pci-fix-doorbell-buffer-value-endianness.patch
+ patches.kernel.org/6.1.3-005-nvme-pci-fix-mempool-alloc-size.patch
+ patches.kernel.org/6.1.3-006-nvme-pci-fix-page-size-checks.patch
+
patches.kernel.org/6.1.3-007-ACPI-resource-do-IRQ-override-on-XMG-Core-15.patch
+
patches.kernel.org/6.1.3-008-ACPI-resource-do-IRQ-override-on-Lenovo-14ALC7.patch
+
patches.kernel.org/6.1.3-009-ACPI-resource-Add-Asus-ExpertBook-B2502-to-Asus.patch
+
patches.kernel.org/6.1.3-010-ACPI-video-Fix-Apple-GMUX-backlight-detection.patch
+
patches.kernel.org/6.1.3-011-block-bfq-fix-uaf-for-bfqq-in-bfq_exit_icq_bfqq.patch
+
patches.kernel.org/6.1.3-012-ata-ahci-Fix-PCS-quirk-application-for-suspend.patch
+
patches.kernel.org/6.1.3-013-nvme-fix-the-NVME_CMD_EFFECTS_CSE_MASK-definiti.patch
+
patches.kernel.org/6.1.3-014-nvmet-don-t-defer-passthrough-commands-with-tri.patch
+ patches.kernel.org/6.1.3-015-fs-ntfs3-Validate-BOOT-record_size.patch
+
patches.kernel.org/6.1.3-016-fs-ntfs3-Add-overflow-check-for-attribute-size.patch
+ patches.kernel.org/6.1.3-017-fs-ntfs3-Validate-data-run-offset.patch
+
patches.kernel.org/6.1.3-018-fs-ntfs3-Add-null-pointer-check-to-attr_load_ru.patch
+
patches.kernel.org/6.1.3-019-fs-ntfs3-Fix-memory-leak-on-ntfs_fill_super-err.patch
+
patches.kernel.org/6.1.3-020-fs-ntfs3-Add-null-pointer-check-for-inode-opera.patch
+
patches.kernel.org/6.1.3-021-fs-ntfs3-Validate-attribute-name-offset.patch
+
patches.kernel.org/6.1.3-022-fs-ntfs3-Validate-buffer-length-while-parsing-i.patch
+
patches.kernel.org/6.1.3-023-fs-ntfs3-Validate-resident-attribute-name.patch
+
patches.kernel.org/6.1.3-024-fs-ntfs3-Fix-slab-out-of-bounds-read-in-run_unp.patch
+
patches.kernel.org/6.1.3-025-soundwire-dmi-quirks-add-quirk-variant-for-LAPB.patch
+
patches.kernel.org/6.1.3-026-phy-sun4i-usb-Introduce-port2-SIDDQ-quirk.patch
+
patches.kernel.org/6.1.3-027-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch
+
patches.kernel.org/6.1.3-028-fs-ntfs3-Validate-index-root-when-initialize-NT.patch
+
patches.kernel.org/6.1.3-029-fs-ntfs3-Use-__GFP_NOWARN-allocation-at-wnd_ini.patch
+
patches.kernel.org/6.1.3-030-fs-ntfs3-Use-__GFP_NOWARN-allocation-at-ntfs_fi.patch
+
patches.kernel.org/6.1.3-031-fs-ntfs3-Delete-duplicate-condition-in-ntfs_rea.patch
+
patches.kernel.org/6.1.3-032-fs-ntfs3-Fix-slab-out-of-bounds-in-r_page.patch
+ patches.kernel.org/6.1.3-033-objtool-Fix-SEGFAULT.patch
+
patches.kernel.org/6.1.3-034-iommu-mediatek-Fix-crash-on-isr-after-kexec.patch
+
patches.kernel.org/6.1.3-035-powerpc-rtas-avoid-device-tree-lookups-in-rtas_.patch
+
patches.kernel.org/6.1.3-036-powerpc-rtas-avoid-scheduling-in-rtas_os_term.patch
+
patches.kernel.org/6.1.3-037-rtc-msc313-Fix-function-prototype-mismatch-in-m.patch
+
patches.kernel.org/6.1.3-038-NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch
+
patches.kernel.org/6.1.3-039-kprobes-kretprobe-events-missing-on-2-core-KVM-.patch
+
patches.kernel.org/6.1.3-040-HID-multitouch-fix-Asus-ExpertBook-P2-P2451FA-t.patch
+
patches.kernel.org/6.1.3-041-HID-plantronics-Additional-PIDs-for-double-volu.patch
+
patches.kernel.org/6.1.3-042-futex-Fix-futex_waitv-hrtimer-debug-object-leak.patch
+
patches.kernel.org/6.1.3-043-rtmutex-Add-acquire-semantics-for-rtmutex-lock-.patch
+
patches.kernel.org/6.1.3-044-mm-mremap-fix-mremap-expanding-vma-with-addr-in.patch
+
patches.kernel.org/6.1.3-045-mm-mempolicy-fix-memory-leak-in-set_mempolicy_h.patch
+ patches.kernel.org/6.1.3-046-kmsan-export-kmsan_handle_urb.patch
+ patches.kernel.org/6.1.3-047-kmsan-include-linux-vmalloc.h.patch
+
patches.kernel.org/6.1.3-048-pstore-Properly-assign-mem_type-property.patch
+
patches.kernel.org/6.1.3-049-pstore-zone-Use-GFP_ATOMIC-to-allocate-zone-buf.patch
+
patches.kernel.org/6.1.3-050-hfsplus-fix-bug-causing-custom-uid-and-gid-bein.patch
+
patches.kernel.org/6.1.3-051-ACPI-x86-s2idle-Force-AMD-GUID-_REV-2-on-HP-Eli.patch
+
patches.kernel.org/6.1.3-052-ACPI-x86-s2idle-Stop-using-AMD-specific-codepat.patch
+
patches.kernel.org/6.1.3-053-binfmt-Fix-error-return-code-in-load_elf_fdpic_.patch
+
patches.kernel.org/6.1.3-054-ovl-Use-ovl-mounter-s-fsuid-and-fsgid-in-ovl_li.patch
+
patches.kernel.org/6.1.3-055-ovl-update-f_iocb_flags-when-ovl_change_flags-m.patch
+
patches.kernel.org/6.1.3-056-ALSA-line6-correct-midi-status-byte-when-receiv.patch
+
patches.kernel.org/6.1.3-057-ALSA-line6-fix-stack-overflow-in-line6_midi_tra.patch
+
patches.kernel.org/6.1.3-058-ALSA-hda-hdmi-Static-PCM-mapping-again-with-AMD.patch
+ patches.kernel.org/6.1.3-059-pnode-terminate-at-peers-of-source.patch
+
patches.kernel.org/6.1.3-060-mfd-mt6360-Add-bounds-checking-in-Regmap-read-w.patch
+ patches.kernel.org/6.1.3-061-md-fix-a-crash-in-mempool_free.patch
+
patches.kernel.org/6.1.3-062-mm-compaction-fix-fast_isolate_around-to-stay-w.patch
+
patches.kernel.org/6.1.3-063-f2fs-should-put-a-page-when-checking-the-summar.patch
+
patches.kernel.org/6.1.3-064-f2fs-allow-to-read-node-block-after-shutdown.patch
+
patches.kernel.org/6.1.3-065-block-Do-not-reread-partition-table-on-exclusiv.patch
+
patches.kernel.org/6.1.3-066-mmc-vub300-fix-warning-do-not-call-blocking-ops.patch
+
patches.kernel.org/6.1.3-067-tpm-acpi-Call-acpi_put_table-to-fix-memory-leak.patch
+
patches.kernel.org/6.1.3-068-tpm-tpm_crb-Add-the-missed-acpi_put_table-to-fi.patch
+
patches.kernel.org/6.1.3-069-tpm-tpm_tis-Add-the-missed-acpi_put_table-to-fi.patch
+
patches.kernel.org/6.1.3-070-SUNRPC-Don-t-leak-netobj-memory-when-gss_read_p.patch
+
patches.kernel.org/6.1.3-071-kcsan-Instrument-memcpy-memset-memmove-with-new.patch
+ patches.kernel.org/6.1.3-072-Linux-6.1.3.patch
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -1221,8 +1293,9 @@
patches.suse/media-dvb-core-Fix-UAF-due-to-refcount-races-at-rele.patch
patches.suse/char-xillybus-Prevent-use-after-free-due-to-race-con.patch
patches.suse/char-xillybus-Fix-trivial-bug-with-mutex.patch
- patches.suse/NFSD-fix-use-after-free-in-__nfs42_ssc_open.patch
- patches.suse/ALSA-hda-hdmi-Static-PCM-mapping-again-with-AMD-HDMI.patch
+
+ # netdev/net
+ patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch
########################################################
# end of sorted patches
@@ -1243,8 +1316,6 @@
patches.suse/char-pcmcia-cm4000_cs-Fix-use-after-free-in-cm4000_f.patch
patches.suse/char-pcmcia-cm4040_cs-Fix-use-after-free-in-reader_f.patch
patches.suse/char-pcmcia-scr24x_cs-Fix-use-after-free-in-scr24x_f.patch
- patches.suse/mm-mremap-fix-mremap-expanding-vma-with-addr-inside-.patch
- patches.suse/tcp-Add-TIME_WAIT-sockets-in-bhash2.patch
########################################################
# kbuild/module infrastructure fixes
++++++ source-timestamp ++++++
--- /var/tmp/diff_new_pack.7NHMuP/_old 2023-01-06 17:04:52.719953240 +0100
+++ /var/tmp/diff_new_pack.7NHMuP/_new 2023-01-06 17:04:52.723953263 +0100
@@ -1,4 +1,4 @@
-2023-01-01 10:46:51 +0000
-GIT Revision: 7fea1503395f43e7cb9ca53b28baccb86c858246
+2023-01-04 11:03:53 +0000
+GIT Revision: a5315fb92e6bf66727da47e30c2686b71c690341
GIT Branch: stable
