Update to 4.19.135

Drop 'Revert "cifs: Fix the target file was deleted when rename failed."'

Cleanup debian/changelog file
This commit is contained in:
Salvatore Bonaccorso 2020-08-27 21:05:06 +02:00
parent 3ccac5b143
commit befbadbdd6
3 changed files with 72 additions and 62 deletions

75
debian/changelog vendored
View File

@ -1,4 +1,4 @@
linux (4.19.134-1) UNRELEASED; urgency=medium
linux (4.19.135-1) UNRELEASED; urgency=medium
* New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.133
@ -162,10 +162,79 @@ linux (4.19.134-1) UNRELEASED; urgency=medium
- printk: queue wake_up_klogd irq_work only if per-CPU areas are ready
- libceph: don't omit recovery_deletes in target_copy()
- rxrpc: Fix trace string
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.135
- mac80211: allow rx of mesh eapol frames with default rx key
- scsi: scsi_transport_spi: Fix function pointer check
- net: sky2: initialize return of gm_phy_read
- drm/nouveau/i2c/g94-: increase NV_PMGR_DP_AUXCTL_TRANSACTREQ timeout
- fuse: fix weird page warning
- [x86] irqdomain/treewide: Keep firmware node unconditionally allocated
- SUNRPC reverting d03727b248d0 ("NFSv4 fix CLOSE not waiting for direct
IO compeletion")
- tipc: clean up skb list lock handling on send path
- IB/umem: fix reference count leak in ib_umem_odp_get()
- uprobes: Change handle_swbp() to send SIGTRAP with si_code=SI_KERNEL, to
fix GDB regression
- ALSA: info: Drop WARN_ON() from buffer NULL sanity check
- btrfs: fix double free on ulist after backref resolution failure
- btrfs: fix mount failure caused by race with umount
- btrfs: fix page leaks after failure to lock page for delalloc
- bnxt_en: Fix race when modifying pause settings.
- [x86] hippi: Fix a size used in a 'pci_free_consistent()' in an error
handling path
- ax88172a: fix ax88172a_unbind() failures
- ieee802154: fix one possible memleak in adf7242_probe
- [arm64,armhf] drm: sun4i: hdmi: Fix inverted HPD result
- [arm64,armhf] net: smc91x: Fix possible memory leak in smc_drv_probe()
- bonding: check error value of register_netdevice() immediately
- qed: suppress "don't support RoCE & iWARP" flooding on HW init
- ipvs: fix the connection sync failed in some cases
- bonding: check return value of register_netdevice() in bond_newlink()
- serial: exar: Fix GPIO configuration for Sealevel cards based on
XR17V35X
- scripts/decode_stacktrace: strip basepath from all paths
- scripts/gdb: fix lx-symbols 'gdb.error' while loading modules
- [arm64,x86] HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor
override
- HID: alps: support devices with report id 2
- HID: steam: fixes race in handling device list.
- HID: apple: Disable Fn-key key-re-mapping on clone keyboards
- [arm64] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
- Input: add `SW_MACHINE_COVER`
- regmap: dev_get_regmap_match(): fix string comparison
- hwmon: (aspeed-pwm-tacho) Avoid possible buffer overflow
- [amd64] dmaengine: ioat setting ioat timeout as module parameter
- Input: synaptics - enable InterTouch for ThinkPad X1E 1st gen
- [arm64] Use test_tsk_thread_flag() for checking TIF_SINGLESTEP
- [arm*] binder: Don't use mmput() from shrinker function.
- usb: xhci: Fix ASM2142/ASM3142 DMA addressing
- Revert "cifs: Fix the target file was deleted when rename failed."
(Closes: #966917)
- [x86] staging: wlan-ng: properly check endpoint types
- [x86] staging: comedi: addi_apci_1032: check INSN_CONFIG_DIGITAL_TRIG
shift
- [x86] staging: comedi: ni_6527: fix INSN_CONFIG_DIGITAL_TRIG support
- [x86] staging: comedi: addi_apci_1500: check INSN_CONFIG_DIGITAL_TRIG
shift
- [x86] staging: comedi: addi_apci_1564: check INSN_CONFIG_DIGITAL_TRIG
shift
- serial: 8250: fix null-ptr-deref in serial8250_start_tx()
- fbdev: Detect integer underflow at "struct fbcon_ops"->clear_margins.
- vt: Reject zero-sized screen buffer size.
- mm/memcg: fix refcount error while moving and swapping
- mm: memcg/slab: synchronize access to kmem_cache dying flag using a
spinlock
- mm: memcg/slab: fix memory leak at non-root kmem_cache destroy
- io-mapping: indicate mapping failure
- drm/amdgpu: Fix NULL dereference in dpm sysfs handlers
- [x86] vmlinux.lds: Page-align end of ..page_aligned sections
- [x86] ASoC: rt5670: Add new gpio1_is_ext_spk_en quirk and enable it on
the Lenovo Miix 2 10
- dm integrity: fix integrity recalculation that is improperly skipped
- ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb
- ath9k: Fix regression with Atheros 9271
[ Salvatore Bonaccorso ]
* Revert "cifs: Fix the target file was deleted when rename failed."
(Closes: #966917)
* Bump ABI to 11
* Drop 'Revert "mips: Add udelay lpj numbers adjustment"'

View File

@ -1,58 +0,0 @@
From: Steve French <stfrench@microsoft.com>
Date: Thu, 23 Jul 2020 14:41:29 -0500
Subject: Revert "cifs: Fix the target file was deleted when rename failed."
Origin: https://git.kernel.org/linus/0e6705182d4e1b77248a93470d6d7b3013d59b30
Bug-Debian: https://bugs.debian.org/966917
This reverts commit 9ffad9263b467efd8f8dc7ae1941a0a655a2bab2.
Upon additional testing with older servers, it was found that
the original commit introduced a regression when using the old SMB1
dialect and rsyncing over an existing file.
The patch will need to be respun to address this, likely including
a larger refactoring of the SMB1 and SMB3 rename code paths to make
it less confusing and also to address some additional rename error
cases that SMB3 may be able to workaround.
Signed-off-by: Steve French <stfrench@microsoft.com>
Reported-by: Patrick Fernie <patrick.fernie@gmail.com>
CC: Stable <stable@vger.kernel.org>
Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
Acked-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com>
---
fs/cifs/inode.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 49c3ea8aa845..ce95801e9b66 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -2044,7 +2044,6 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry,
FILE_UNIX_BASIC_INFO *info_buf_target;
unsigned int xid;
int rc, tmprc;
- bool new_target = d_really_is_negative(target_dentry);
if (flags & ~RENAME_NOREPLACE)
return -EINVAL;
@@ -2121,13 +2120,8 @@ cifs_rename2(struct inode *source_dir, struct dentry *source_dentry,
*/
unlink_target:
- /*
- * If the target dentry was created during the rename, try
- * unlinking it if it's not negative
- */
- if (new_target &&
- d_really_is_positive(target_dentry) &&
- (rc == -EACCES || rc == -EEXIST)) {
+ /* Try unlinking the target dentry if it's not negative */
+ if (d_really_is_positive(target_dentry) && (rc == -EACCES || rc == -EEXIST)) {
if (d_is_dir(target_dentry))
tmprc = cifs_rmdir(target_dir, target_dentry);
else
--
2.28.0

View File

@ -100,7 +100,6 @@ bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
debian/revert-objtool-fix-config_stack_validation-y-warning.patch
bugfix/all/mt76-use-the-correct-hweight8-function.patch
bugfix/all/rtc-s35390a-set-uie_unsupported.patch
bugfix/all/Revert-cifs-Fix-the-target-file-was-deleted-when-ren.patch
# Miscellaneous features
features/all/e1000e-Add-support-for-Comet-Lake.patch