From 0adb77a17841f72ea32511afcc608853eb558910 Mon Sep 17 00:00:00 2001 From: Akemi Yagi Date: Feb 04 2020 18:35:18 +0000 Subject: c7 plus kernel update to 3.10.0-1062.12.1.el7 Signed-off-by: Akemi Yagi --- diff --git a/SOURCES/Makefile.common b/SOURCES/Makefile.common index 6eebaaa..a18c3cd 100644 --- a/SOURCES/Makefile.common +++ b/SOURCES/Makefile.common @@ -9,7 +9,7 @@ RPMVERSION:=3.10.0 # marker is git tag which we base off of for exporting patches MARKER:=v3.10 PREBUILD:= -BUILD:=1062.9.1 +BUILD:=1062.12.1 DIST:=.el7 SPECFILE:=kernel.spec RPM:=$(REDHAT)/rpm diff --git a/SOURCES/centos-linux-3.10-cifs-fix-bug16824.patch b/SOURCES/centos-linux-3.10-cifs-fix-bug16824.patch new file mode 100644 index 0000000..75d1d5b --- /dev/null +++ b/SOURCES/centos-linux-3.10-cifs-fix-bug16824.patch @@ -0,0 +1,77 @@ + +--- a/fs/cifs/smb2file.c 2019-12-13 16:02:36.554483353 +1100 ++++ b/fs/cifs/smb2file.c 2019-12-13 16:04:43.955718087 +1100 +@@ -61,6 +61,9 @@ + oparms->desired_access |= FILE_READ_ATTRIBUTES; + smb2_oplock = SMB2_OPLOCK_LEVEL_BATCH; + ++ if (backup_cred(oparms->cifs_sb)) ++ oparms->create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, oparms, smb2_path, &smb2_oplock, smb2_data, NULL); + if (rc) + goto out; +--- a/fs/cifs/smb2inode.c 2019-12-13 16:02:41.945747190 +1100 ++++ b/fs/cifs/smb2inode.c 2019-12-13 16:04:48.929961516 +1100 +@@ -60,6 +60,9 @@ + oparms.fid = &fid; + oparms.reconnect = false; + ++ if (backup_cred(cifs_sb)) ++ oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); + if (rc) { + kfree(utf16_path); +--- a/fs/cifs/smb2ops.c 2019-12-13 16:02:53.280301878 +1100 ++++ b/fs/cifs/smb2ops.c 2019-12-13 16:05:00.987551588 +1100 +@@ -385,6 +385,9 @@ + oparms.fid = &fid; + oparms.reconnect = false; + ++ if (backup_cred(cifs_sb)) ++ oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); + if (rc) { + kfree(utf16_path); +@@ -535,6 +538,9 @@ + oparms.fid = &fid; + oparms.reconnect = false; + ++ if (backup_cred(cifs_sb)) ++ oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); + kfree(utf16_path); + if (rc) { +@@ -614,6 +620,9 @@ + oparms.fid = &fid; + oparms.reconnect = false; + ++ if (backup_cred(cifs_sb)) ++ oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); + kfree(utf16_path); + if (rc) { +@@ -1192,6 +1201,9 @@ + oparms.fid = fid; + oparms.reconnect = false; + ++ if (backup_cred(cifs_sb)) ++ oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL); + kfree(utf16_path); + if (rc) { +@@ -1465,6 +1477,9 @@ + oparms.fid = &fid; + oparms.reconnect = false; + ++ if (backup_cred(cifs_sb)) ++ oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; ++ + rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, &err_buf); + + if (!rc || !err_buf) { diff --git a/SPECS/kernel-plus.spec b/SPECS/kernel-plus.spec index 4cfe626..0c13ff7 100644 --- a/SPECS/kernel-plus.spec +++ b/SPECS/kernel-plus.spec @@ -14,10 +14,10 @@ Summary: The Linux kernel %global distro_build 1062 %define rpmversion 3.10.0 -%define pkgrelease 1062.9.1.el7 +%define pkgrelease 1062.12.1.el7 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 1062.9.1%{?dist} +%define specrelease 1062.12.1%{?dist} %define pkg_release %{specrelease}%{?buildid} @@ -569,6 +569,7 @@ Patch20224: centos-linux-3.10-niu-fix-build-errors-bug15040.patch #Patch20233: centos-linux-3.10-tcp-fix-bug16242.patch Patch20234: centos-linux-3.10-acpi-ghes-bug16315.patch Patch20235: centos-linux-3.10-net-ICMP-report-fix-bug16521.patch +Patch20236: centos-linux-3.10-cifs-fix-bug16824.patch # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -1041,6 +1042,7 @@ ApplyOptionalPatch centos-linux-3.10-niu-fix-build-errors-bug15040.patch #ApplyOptionalPatch centos-linux-3.10-tcp-fix-bug16242.patch ApplyOptionalPatch centos-linux-3.10-acpi-ghes-bug16315.patch ApplyOptionalPatch centos-linux-3.10-net-ICMP-report-fix-bug16521.patch +ApplyOptionalPatch centos-linux-3.10-cifs-fix-bug16824.patch ### end of plus mod # End of CentOS Modification @@ -2043,7 +2045,7 @@ fi %kernel_variant_files %{with_kdump} kdump %changelog -* Thu Dec 05 2019 Akemi Yagi [3.10.0-1062.9.1.el7.centos.plus] +* Tue Feb 04 2020 Akemi Yagi [3.10.0-1062.12.1.el7.centos.plus] - Apply debranding changes - Roll in i686 mods addmissing.patch [puias] @@ -2099,6 +2101,48 @@ fi - Enable NIU and add a patch that fixes build errors submitted by h-masuda [bug#15040] - Apply a patch for acpi issue [bug#16315] - Apply a patch to fix ICMP redirects [bug#16521] +- Apply a patch to fix cifs [bug#16824] + +* Thu Dec 12 2019 Frantisek Hrbata [3.10.0-1062.12.1.el7] +- [powerpc] powerpc/pseries: Remove confusing warning message (Gustavo Duarte) [1780148 1748306] +- [powerpc] powerpc/pseries: Call H_BLOCK_REMOVE when supported (Gustavo Duarte) [1780148 1748306] +- [powerpc] powerpc/pseries: Read TLB Block Invalidate Characteristics (Gustavo Duarte) [1780148 1748306] +- [scsi] scsi: bnx2fc: Handle scope bits when array returns BUSY or TSF (Nilesh Javali) [1776290 1750577] +- [scsi] scsi: bnx2fc: remove set but not used variables 'task', 'port', 'orig_task' (Nilesh Javali) [1776290 1750577] +- [scsi] scsi: bnx2fc: remove set but not used variables 'lport', 'host' (Nilesh Javali) [1776290 1750577] +- [scsi] scsi: bnx2fc: remove set but not used variable 'fh' (Nilesh Javali) [1776290 1750577] +- [fs] SMB3: retry on STATUS_INSUFFICIENT_RESOURCES instead of failing write (Leif Sahlberg) [1767621 1764567] + +* Tue Dec 10 2019 Frantisek Hrbata [3.10.0-1062.11.1.el7] +- [tty] TTY: serial_core, add ->install (Kenneth Yin) [1780163 1443152] +- [net] gro: fix use-after-free read in napi_gro_frags() (Paolo Abeni) [1780033 1750810] +- [net] cfg80211: wext: avoid copying malformed SSIDs (Stanislaw Gruszka) [1778631 1778632] +- [fs] userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx (Alex Gladkov) [1777351 1749766] +- [fs] gfs2: Use async glocks for rename (Robert S Peterson) [1777297 1677686] +- [fs] gfs2: create function gfs2_glock_update_hold_time (Robert S Peterson) [1777297 1677686] +- [fs] gfs2: separate holder for rgrps in gfs2_rename (Robert S Peterson) [1777297 1677686] +- [wireless] mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings (Stanislaw Gruszka) [1776615 1776616] +- [x86] cpuidle-haltpoll: vcpu hotplug support (Marcelo Tosatti) [1776289 1771849] +- [cpuidle] cpuidle-haltpoll: return -ENODEV on modinit failure (Marcelo Tosatti) [1776289 1756843] +- [wireless] mwifiex: fix possible heap overflow in mwifiex_process_country_ie() (Stanislaw Gruszka) [1776205 1776206] +- [wireless] mwifiex: Fix heap overflow in mmwifiex_process_tdls_action_frame() (Stanislaw Gruszka) [1776156 1776157] {CVE-2019-14901} +- [fs] vfs: Fix EOVERFLOW testing in put_compat_statfs64 (Eric Sandeen) [1775678 1758001] +- [x86] x86/atomic: Fix smp_mb__{before,after}_atomic() (Prarit Bhargava) [1772812 1769569] +- [mm] mm-vmstat-reduce-zone-lock-holding-time-by-proc-pagetypeinfo-fix (Waiman Long) [1770732 1757943] +- [mm] mm, vmstat: reduce zone->lock holding time by /proc/pagetypeinfo (Waiman Long) [1770732 1757943] +- [mm] mm, vmstat: hide /proc/pagetypeinfo from normal users (Waiman Long) [1770732 1757943] +- [md] dm rq: fix handling underlying queue busy (Ming Lei) [1770113 1767482] +- [pci] hv: Use bytes 4 and 5 from instance ID as the PCI domain numbers (Mohammed Gamal) [1766097 1634251] +- [pci] hv: Detect and fix Hyper-V PCI domain number collision (Mohammed Gamal) [1766097 1634251] +- [pci] hv: Serialize the present and eject work items (Mohammed Gamal) [1766097 1634251] +- [netdrv] hv_netvsc: fix network namespace issues with VF support (Mohammed Gamal) [1766093 1741334] +- [netdrv] hv_netvsc: move VF to same namespace as netvsc device (Mohammed Gamal) [1766093 1741334] +- [netdrv] hv_netvsc: set master device (Mohammed Gamal) [1766093 1741334] +- [pci] PCI: hv: Avoid use of hv_pci_dev->pci_slot after freeing it (Mohammed Gamal) [1766089 1737567] + +* Wed Dec 04 2019 Frantisek Hrbata [3.10.0-1062.10.1.el7] +- [net] netfilter: masquerade: don't flush all conntracks if only one address deleted on device (Patrick Talbert) [1779564 1771396] +- [net] netfilter: conntrack: resched in nf_ct_iterate_cleanup (Patrick Talbert) [1779564 1771396] * Mon Dec 02 2019 Frantisek Hrbata [3.10.0-1062.9.1.el7] - [kernel] sched: Fix race between task_group and sched_task_group (Oleksandr Natalenko) [1778545 1738415]