Update to 4.19.133

Drop 'Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb"'

Cleanup debian/changelog file
This commit is contained in:
Salvatore Bonaccorso 2020-08-27 16:36:19 +02:00
parent 868ca68cdf
commit d3e5a2910c
3 changed files with 52 additions and 194 deletions

53
debian/changelog vendored
View File

@ -1,5 +1,56 @@
linux (4.19.132-2) UNRELEASED; urgency=medium
linux (4.19.133-1) UNRELEASED; urgency=medium
* New upstream stable update:
https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.19.133
- [s390x] KVM: s390: reduce number of IO pins to 1
- regmap: fix alignment issue
- [arm64,armhf] drm/tegra: hub: Do not enable orphaned window group
- [arm64,armhf] gpu: host1x: Detach driver on unregister
- spi: spidev: fix a race between spidev_release and spidev_remove
- spi: spidev: fix a potential use-after-free in spidev_release()
- ixgbe: protect ring accesses with READ- and WRITE_ONCE
- i40e: protect ring accesses with READ- and WRITE_ONCE
- drm: panel-orientation-quirks: Add quirk for Asus T101HA panel
- drm: panel-orientation-quirks: Use generic orientation-data for Acer
S1003
- cifs: update ctime and mtime during truncate
- [armhf] imx6: add missing put_device() call in imx6q_suspend_init()
- scsi: mptscsih: Fix read sense data size
- [arm64] usb: dwc3: pci: Fix reference count leak in dwc3_pci_resume_work
- block: release bip in a right way in error path
- nvme-rdma: assign completion vector correctly
- [x86] entry: Increase entry_stack size to a full page
- net: cxgb4: fix return error value in t4_prep_fw
- smsc95xx: check return value of smsc95xx_reset
- smsc95xx: avoid memory leak in smsc95xx_bind
- [arm64] net: hns3: fix use-after-free when doing self test
- [x86] ALSA: compress: fix partial_drain completion state
- nbd: Fix memory leak in nbd_add_socket
- cxgb4: fix all-mask IP address comparison
- bnxt_en: fix NULL dereference in case SR-IOV configuration fails
- [arm64] net: macb: mark device wake capable when "magic-packet" property
present
- ALSA: opl3: fix infoleak in opl3
- ALSA: hda - let hs_mic be picked ahead of hp_mic
- ALSA: usb-audio: add quirk for MacroSilicon MS2109
- [arm64] KVM: Fix definition of PAGE_HYP_DEVICE
- [arm64] KVM: Stop clobbering x0 for HVC_SOFT_RESTART
- [x86] KVM: bit 8 of non-leaf PDPEs is not reserved
- [x86] KVM: Inject #GP if guest attempts to toggle CR4.LA57 in 64-bit
mode
- [x86] KVM: Mark CR4.TSD as being possibly owned by the guest
- kallsyms: Refactor kallsyms_show_value() to take cred
- kernel: module: Use struct_size() helper
- module: Refactor section attr into bin attribute
- module: Do not expose section addresses to non-CAP_SYSLOG
- kprobes: Do not expose probe addresses to non-CAP_SYSLOG
- bpf: Check correct cred for CAP_SYSLOG in bpf_dump_raw_ok()
- btrfs: fix fatal extent_buffer readahead vs releasepage race
- drm/radeon: fix double free
- dm: use noio when sending kobject event
- [s390x] mm: fix huge pte soft dirty copying
[ Salvatore Bonaccorso ]
* Revert "cifs: Fix the target file was deleted when rename failed."
(Closes: #966917)

View File

@ -1,192 +0,0 @@
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 14 Jul 2020 14:03:44 +0200
Subject: Revert "ath9k: Fix general protection fault in ath9k_hif_usb_rx_cb"
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=54d2495b1a787ffb1846efbe1277d2d37f3ebc21
Bug-Debian: https://bugs.debian.org/964153
Bug-Debian: https://bugs.debian.org/964480
Bug: https://bugzilla.kernel.org/show_bug.cgi?id=208251
This reverts commit bdf4d37b03dc410b91f318c8e097a41e732d1038 which is
commit 2bbcaaee1fcbd83272e29f31e2bb7e70d8c49e05 upstream.
It is being reverted upstream, just hasn't made it there yet and is
causing lots of problems.
Reported-by: Hans de Goede <hdegoede@redhat.com>
Cc: Qiujun Huang <hqjagain@gmail.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/wireless/ath/ath9k/hif_usb.c | 48 ++++++------------------
drivers/net/wireless/ath/ath9k/hif_usb.h | 5 ---
2 files changed, 11 insertions(+), 42 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
index 4ed21dad6a8e..6049d3766c64 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -643,9 +643,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
static void ath9k_hif_usb_rx_cb(struct urb *urb)
{
- struct rx_buf *rx_buf = (struct rx_buf *)urb->context;
- struct hif_device_usb *hif_dev = rx_buf->hif_dev;
- struct sk_buff *skb = rx_buf->skb;
+ struct sk_buff *skb = (struct sk_buff *) urb->context;
+ struct hif_device_usb *hif_dev =
+ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
int ret;
if (!skb)
@@ -685,15 +685,14 @@ static void ath9k_hif_usb_rx_cb(struct urb *urb)
return;
free:
kfree_skb(skb);
- kfree(rx_buf);
}
static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
{
- struct rx_buf *rx_buf = (struct rx_buf *)urb->context;
- struct hif_device_usb *hif_dev = rx_buf->hif_dev;
- struct sk_buff *skb = rx_buf->skb;
+ struct sk_buff *skb = (struct sk_buff *) urb->context;
struct sk_buff *nskb;
+ struct hif_device_usb *hif_dev =
+ usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
int ret;
if (!skb)
@@ -751,7 +750,6 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb)
return;
free:
kfree_skb(skb);
- kfree(rx_buf);
urb->context = NULL;
}
@@ -797,7 +795,7 @@ static int ath9k_hif_usb_alloc_tx_urbs(struct hif_device_usb *hif_dev)
init_usb_anchor(&hif_dev->mgmt_submitted);
for (i = 0; i < MAX_TX_URB_NUM; i++) {
- tx_buf = kzalloc(sizeof(*tx_buf), GFP_KERNEL);
+ tx_buf = kzalloc(sizeof(struct tx_buf), GFP_KERNEL);
if (!tx_buf)
goto err;
@@ -834,9 +832,8 @@ static void ath9k_hif_usb_dealloc_rx_urbs(struct hif_device_usb *hif_dev)
static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
{
- struct rx_buf *rx_buf = NULL;
- struct sk_buff *skb = NULL;
struct urb *urb = NULL;
+ struct sk_buff *skb = NULL;
int i, ret;
init_usb_anchor(&hif_dev->rx_submitted);
@@ -844,12 +841,6 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
for (i = 0; i < MAX_RX_URB_NUM; i++) {
- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);
- if (!rx_buf) {
- ret = -ENOMEM;
- goto err_rxb;
- }
-
/* Allocate URB */
urb = usb_alloc_urb(0, GFP_KERNEL);
if (urb == NULL) {
@@ -864,14 +855,11 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
goto err_skb;
}
- rx_buf->hif_dev = hif_dev;
- rx_buf->skb = skb;
-
usb_fill_bulk_urb(urb, hif_dev->udev,
usb_rcvbulkpipe(hif_dev->udev,
USB_WLAN_RX_PIPE),
skb->data, MAX_RX_BUF_SIZE,
- ath9k_hif_usb_rx_cb, rx_buf);
+ ath9k_hif_usb_rx_cb, skb);
/* Anchor URB */
usb_anchor_urb(urb, &hif_dev->rx_submitted);
@@ -897,8 +885,6 @@ static int ath9k_hif_usb_alloc_rx_urbs(struct hif_device_usb *hif_dev)
err_skb:
usb_free_urb(urb);
err_urb:
- kfree(rx_buf);
-err_rxb:
ath9k_hif_usb_dealloc_rx_urbs(hif_dev);
return ret;
}
@@ -910,21 +896,14 @@ static void ath9k_hif_usb_dealloc_reg_in_urbs(struct hif_device_usb *hif_dev)
static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
{
- struct rx_buf *rx_buf = NULL;
- struct sk_buff *skb = NULL;
struct urb *urb = NULL;
+ struct sk_buff *skb = NULL;
int i, ret;
init_usb_anchor(&hif_dev->reg_in_submitted);
for (i = 0; i < MAX_REG_IN_URB_NUM; i++) {
- rx_buf = kzalloc(sizeof(*rx_buf), GFP_KERNEL);
- if (!rx_buf) {
- ret = -ENOMEM;
- goto err_rxb;
- }
-
/* Allocate URB */
urb = usb_alloc_urb(0, GFP_KERNEL);
if (urb == NULL) {
@@ -939,14 +918,11 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
goto err_skb;
}
- rx_buf->hif_dev = hif_dev;
- rx_buf->skb = skb;
-
usb_fill_int_urb(urb, hif_dev->udev,
usb_rcvintpipe(hif_dev->udev,
USB_REG_IN_PIPE),
skb->data, MAX_REG_IN_BUF_SIZE,
- ath9k_hif_usb_reg_in_cb, rx_buf, 1);
+ ath9k_hif_usb_reg_in_cb, skb, 1);
/* Anchor URB */
usb_anchor_urb(urb, &hif_dev->reg_in_submitted);
@@ -972,8 +948,6 @@ static int ath9k_hif_usb_alloc_reg_in_urbs(struct hif_device_usb *hif_dev)
err_skb:
usb_free_urb(urb);
err_urb:
- kfree(rx_buf);
-err_rxb:
ath9k_hif_usb_dealloc_reg_in_urbs(hif_dev);
return ret;
}
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
index 5985aa15ca93..a94e7e1c86e9 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -86,11 +86,6 @@ struct tx_buf {
struct list_head list;
};
-struct rx_buf {
- struct sk_buff *skb;
- struct hif_device_usb *hif_dev;
-};
-
#define HIF_USB_TX_STOP BIT(0)
#define HIF_USB_TX_FLUSH BIT(1)
--
2.27.0

View File

@ -101,7 +101,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-ath9k-Fix-general-protection-fault-in-ath9k_h.patch
bugfix/all/Revert-cifs-Fix-the-target-file-was-deleted-when-ren.patch
# Miscellaneous features