summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Cline <jcline@redhat.com>2019-12-13 17:11:19 -0500
committerJeremy Cline <jcline@redhat.com>2019-12-13 17:11:19 -0500
commitcaa351c3d61a0219285297c17fbb8c45847e489c (patch)
tree9f280e0816895626c177322ded2d7dd0698a4edd
parentff218a4ef1fc7a59f77fa3f09f1b46f4629bc12d (diff)
downloadkernel-caa351c3d61a0219285297c17fbb8c45847e489c.tar.gz
kernel-caa351c3d61a0219285297c17fbb8c45847e489c.tar.xz
kernel-caa351c3d61a0219285297c17fbb8c45847e489c.zip
Linux v5.4.3
-rw-r--r--0001-bdev-Factor-out-bdev-revalidation-into-a-common-help.patch68
-rw-r--r--0002-bdev-Refresh-bdev-size-for-disks-without-partitionin.patch61
-rw-r--r--alsa-5.5.patch443
-rw-r--r--crypto-user-fix-memory-leak-in-crypto_reportstat.patch107
-rw-r--r--kernel.spec16
-rw-r--r--rsi-release-skb-if-rsi_prepare_beacon-fails.patch101
-rw-r--r--sources2
7 files changed, 5 insertions, 793 deletions
diff --git a/0001-bdev-Factor-out-bdev-revalidation-into-a-common-help.patch b/0001-bdev-Factor-out-bdev-revalidation-into-a-common-help.patch
deleted file mode 100644
index 1e979a1fa..000000000
--- a/0001-bdev-Factor-out-bdev-revalidation-into-a-common-help.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From aea39223667868c77936546004b84716a623a438 Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Mon, 21 Oct 2019 10:37:59 +0200
-Subject: [PATCH 1/2] bdev: Factor out bdev revalidation into a common helper
-
-Factor out code handling revalidation of bdev on disk change into a
-common helper.
-
-Signed-off-by: Jan Kara <jack@suse.cz>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- fs/block_dev.c | 26 ++++++++++++++------------
- 1 file changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 9c073dbdc1b0..88c6d35ec71d 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -1512,6 +1512,14 @@ EXPORT_SYMBOL(bd_set_size);
-
- static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
-
-+static void bdev_disk_changed(struct block_device *bdev, bool invalidate)
-+{
-+ if (invalidate)
-+ invalidate_partitions(bdev->bd_disk, bdev);
-+ else
-+ rescan_partitions(bdev->bd_disk, bdev);
-+}
-+
- /*
- * bd_mutex locking:
- *
-@@ -1594,12 +1602,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- * The latter is necessary to prevent ghost
- * partitions on a removed medium.
- */
-- if (bdev->bd_invalidated) {
-- if (!ret)
-- rescan_partitions(disk, bdev);
-- else if (ret == -ENOMEDIUM)
-- invalidate_partitions(disk, bdev);
-- }
-+ if (bdev->bd_invalidated &&
-+ (!ret || ret == -ENOMEDIUM))
-+ bdev_disk_changed(bdev, ret == -ENOMEDIUM);
-
- if (ret)
- goto out_clear;
-@@ -1632,12 +1637,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
- if (bdev->bd_disk->fops->open)
- ret = bdev->bd_disk->fops->open(bdev, mode);
- /* the same as first opener case, read comment there */
-- if (bdev->bd_invalidated) {
-- if (!ret)
-- rescan_partitions(bdev->bd_disk, bdev);
-- else if (ret == -ENOMEDIUM)
-- invalidate_partitions(bdev->bd_disk, bdev);
-- }
-+ if (bdev->bd_invalidated &&
-+ (!ret || ret == -ENOMEDIUM))
-+ bdev_disk_changed(bdev, ret == -ENOMEDIUM);
- if (ret)
- goto out_unlock_bdev;
- }
---
-2.21.0
-
diff --git a/0002-bdev-Refresh-bdev-size-for-disks-without-partitionin.patch b/0002-bdev-Refresh-bdev-size-for-disks-without-partitionin.patch
deleted file mode 100644
index c988fa6a8..000000000
--- a/0002-bdev-Refresh-bdev-size-for-disks-without-partitionin.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 91ee136f5e2179a0994985ea043468bbbcd400d4 Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Mon, 21 Oct 2019 10:38:00 +0200
-Subject: [PATCH 2/2] bdev: Refresh bdev size for disks without partitioning
-
-Currently, block device size in not updated on second and further open
-for block devices where partition scan is disabled. This is particularly
-annoying for example for DVD drives as that means block device size does
-not get updated once the media is inserted into a drive if the device is
-already open when inserting the media. This is actually always the case
-for example when pktcdvd is in use.
-
-Fix the problem by revalidating block device size on every open even for
-devices with partition scan disabled.
-
-Signed-off-by: Jan Kara <jack@suse.cz>
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
----
- fs/block_dev.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 88c6d35ec71d..d612468ee66b 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -1403,11 +1403,7 @@ static void flush_disk(struct block_device *bdev, bool kill_dirty)
- "resized disk %s\n",
- bdev->bd_disk ? bdev->bd_disk->disk_name : "");
- }
--
-- if (!bdev->bd_disk)
-- return;
-- if (disk_part_scan_enabled(bdev->bd_disk))
-- bdev->bd_invalidated = 1;
-+ bdev->bd_invalidated = 1;
- }
-
- /**
-@@ -1514,10 +1510,15 @@ static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
-
- static void bdev_disk_changed(struct block_device *bdev, bool invalidate)
- {
-- if (invalidate)
-- invalidate_partitions(bdev->bd_disk, bdev);
-- else
-- rescan_partitions(bdev->bd_disk, bdev);
-+ if (disk_part_scan_enabled(bdev->bd_disk)) {
-+ if (invalidate)
-+ invalidate_partitions(bdev->bd_disk, bdev);
-+ else
-+ rescan_partitions(bdev->bd_disk, bdev);
-+ } else {
-+ check_disk_size_change(bdev->bd_disk, bdev, !invalidate);
-+ bdev->bd_invalidated = 0;
-+ }
- }
-
- /*
---
-2.21.0
-
diff --git a/alsa-5.5.patch b/alsa-5.5.patch
index 7b2162a63..c08facb23 100644
--- a/alsa-5.5.patch
+++ b/alsa-5.5.patch
@@ -1492,67 +1492,6 @@ index 2e5742d095ff..e0e9d4ee180d 100644
2.20.1
-From faecd54be3265217bc7f8499c3f9e1d230ccd05d Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 28 Oct 2019 11:58:03 +0100
-Subject: [PATCH 012/130] ALSA: hda - Fix pending unsol events at shutdown
-
-This is an alternative fix attemp for the issue reported in the commit
-caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was
-reverted later due to regressions. Instead of tweaking the hardware
-disablement order and the enforced irq flushing, do calling
-cancel_work_sync() of the unsol work early enough, and explicitly
-ignore the unsol events during the shutdown by checking the
-bus->shutdown flag.
-
-Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling")
-Cc: Chris Wilson <chris@chris-wilson.co.uk>
-Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit ca58f55108fee41d87c9123f85ad4863e5de7f45)
-Bugzilla: 1772498
----
- sound/pci/hda/hda_bind.c | 4 ++++
- sound/pci/hda/hda_intel.c | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/sound/pci/hda/hda_bind.c b/sound/pci/hda/hda_bind.c
-index 8272b50b8349..6a8564566375 100644
---- a/sound/pci/hda/hda_bind.c
-+++ b/sound/pci/hda/hda_bind.c
-@@ -43,6 +43,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev)
- {
- struct hda_codec *codec = container_of(dev, struct hda_codec, core);
-
-+ /* ignore unsol events during shutdown */
-+ if (codec->bus->shutdown)
-+ return;
-+
- if (codec->patch_ops.unsol_event)
- codec->patch_ops.unsol_event(codec, ev);
- }
-diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
-index e0e9d4ee180d..8981109e3565 100644
---- a/sound/pci/hda/hda_intel.c
-+++ b/sound/pci/hda/hda_intel.c
-@@ -1389,8 +1389,11 @@ static int azx_free(struct azx *chip)
- static int azx_dev_disconnect(struct snd_device *device)
- {
- struct azx *chip = device->device_data;
-+ struct hdac_bus *bus = azx_bus(chip);
-
- chip->bus.shutdown = 1;
-+ cancel_work_sync(&bus->unsol_work);
-+
- return 0;
- }
-
---
-2.20.1
-
-
From e3eb037a46c5b6771e9336bb493063dbffb90e04 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Tue, 29 Oct 2019 15:40:09 +0200
@@ -10529,106 +10468,6 @@ index 4c83ed4b0d5c..4ebe104cb592 100644
2.20.1
-From 98b36775111220537b7a2c33c8c0b65c79541df7 Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Thu, 21 Nov 2019 10:54:27 +0800
-Subject: [PATCH 105/130] ALSA: hda/realtek - Enable the headset-mic on a
- Xiaomi's laptop
-
-The headset on this machine is not defined, after applying the quirk
-ALC256_FIXUP_ASUS_HEADSET_MIC, the headset-mic works well
-
-BugLink: https://bugs.launchpad.net/bugs/1846148
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-Link: https://lore.kernel.org/r/20191121025427.8856-1-hui.wang@canonical.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 695d1ec3994f9de2cefae80ee2087c95d2e5a2f3)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_realtek.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 4ebe104cb592..bd0c767981b1 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7248,6 +7248,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
- SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS),
- SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */
-+ SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),
- SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),
-
- #if 0
---
-2.20.1
-
-
-From 68b55950038f262d8f2675fa0ccb76bcf9ad398e Mon Sep 17 00:00:00 2001
-From: Jian-Hong Pan <jian-hong@endlessm.com>
-Date: Mon, 25 Nov 2019 17:34:06 +0800
-Subject: [PATCH 106/130] ALSA: hda/realtek - Enable internal speaker of ASUS
- UX431FLC
-
-Laptops like ASUS UX431FLC and UX431FL can share the same audio quirks.
-But UX431FLC needs one more step to enable the internal speaker: Pull
-the GPIO from CODEC to initialize the AMP.
-
-Fixes: 60083f9e94b2 ("ALSA: hda/realtek - Enable internal speaker & headset mic of ASUS UX431FL")
-Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20191125093405.5702-1-jian-hong@endlessm.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 436e25505f3458cc92c7f3c985e9cbc198a98209)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_realtek.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index bd0c767981b1..d2bf70a1d2fd 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -5892,6 +5892,7 @@ enum {
- ALC299_FIXUP_PREDATOR_SPK,
- ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC,
- ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE,
-+ ALC294_FIXUP_ASUS_INTSPK_GPIO,
- };
-
- static const struct hda_fixup alc269_fixups[] = {
-@@ -6982,6 +6983,13 @@ static const struct hda_fixup alc269_fixups[] = {
- .chained = true,
- .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE
- },
-+ [ALC294_FIXUP_ASUS_INTSPK_GPIO] = {
-+ .type = HDA_FIXUP_FUNC,
-+ /* The GPIO must be pulled to initialize the AMP */
-+ .v.func = alc_fixup_gpio4,
-+ .chained = true,
-+ .chain_id = ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC
-+ },
- };
-
- static const struct snd_pci_quirk alc269_fixup_tbl[] = {
-@@ -7141,7 +7149,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),
- SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A),
- SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),
-- SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC),
-+ SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_GPIO),
- SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),
- SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),
- SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),
---
-2.20.1
-
-
From 268e8ce52ad4278f6b94792483d3f8510b435b3e Mon Sep 17 00:00:00 2001
From: Jens Verwiebe <info@jensverwiebe.de>
Date: Sun, 24 Nov 2019 13:35:44 +0100
@@ -11847,112 +11686,6 @@ index 9c1aa4ec9cba..dd2b5ad08659 100644
2.20.1
-From 04e4b5accb0405d3ba338dd244fc9c4510f8cd3e Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 2 Dec 2019 08:49:47 +0100
-Subject: [PATCH 123/130] ALSA: hda: Modify stream stripe mask only when needed
-
-The recent commit in HD-audio stream management for changing the
-stripe control seems causing a regression on some platforms. The
-stripe control is currently used only by HDMI codec, and applying the
-stripe mask unconditionally may lead to scratchy and static noises as
-seen on some MacBooks.
-
-For addressing the regression, this patch changes the stream
-management code to apply the stripe mask conditionally only when the
-codec driver requested.
-
-Fixes: 9b6f7e7a296e ("ALSA: hda: program stripe bits for controller")
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=204477
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20191202074947.1617-1-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit cb50445130d14a5a609d7cd88db9d0436313c881)
-Bugzilla: 1772498
----
- include/sound/hdaudio.h | 1 +
- sound/hda/hdac_stream.c | 19 ++++++++++++-------
- sound/pci/hda/patch_hdmi.c | 5 +++++
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
-index b260c5fd2337..e05b95e83d5a 100644
---- a/include/sound/hdaudio.h
-+++ b/include/sound/hdaudio.h
-@@ -493,6 +493,7 @@ struct hdac_stream {
- bool prepared:1;
- bool no_period_wakeup:1;
- bool locked:1;
-+ bool stripe:1; /* apply stripe control */
-
- /* timestamp */
- unsigned long start_wallclk; /* start + minimum wallclk */
-diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c
-index d8fe7ff0cd58..f9707fb05efe 100644
---- a/sound/hda/hdac_stream.c
-+++ b/sound/hda/hdac_stream.c
-@@ -96,12 +96,14 @@ void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start)
- 1 << azx_dev->index,
- 1 << azx_dev->index);
- /* set stripe control */
-- if (azx_dev->substream)
-- stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream);
-- else
-- stripe_ctl = 0;
-- snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK,
-- stripe_ctl);
-+ if (azx_dev->stripe) {
-+ if (azx_dev->substream)
-+ stripe_ctl = snd_hdac_get_stream_stripe_ctl(bus, azx_dev->substream);
-+ else
-+ stripe_ctl = 0;
-+ snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK,
-+ stripe_ctl);
-+ }
- /* set DMA start and interrupt mask */
- snd_hdac_stream_updateb(azx_dev, SD_CTL,
- 0, SD_CTL_DMA_START | SD_INT_MASK);
-@@ -118,7 +120,10 @@ void snd_hdac_stream_clear(struct hdac_stream *azx_dev)
- snd_hdac_stream_updateb(azx_dev, SD_CTL,
- SD_CTL_DMA_START | SD_INT_MASK, 0);
- snd_hdac_stream_writeb(azx_dev, SD_STS, SD_INT_MASK); /* to be sure */
-- snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);
-+ if (azx_dev->stripe) {
-+ snd_hdac_stream_updateb(azx_dev, SD_CTL_3B, SD_CTL_STRIPE_MASK, 0);
-+ azx_dev->stripe = 0;
-+ }
- azx_dev->running = false;
- }
- EXPORT_SYMBOL_GPL(snd_hdac_stream_clear);
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 71848dce0025..b35652cae616 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -32,6 +32,7 @@
- #include <sound/hda_codec.h>
- #include "hda_local.h"
- #include "hda_jack.h"
-+#include "hda_controller.h"
-
- static bool static_hdmi_pcm;
- module_param(static_hdmi_pcm, bool, 0644);
-@@ -1222,6 +1223,10 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
- per_pin->cvt_nid = per_cvt->cvt_nid;
- hinfo->nid = per_cvt->cvt_nid;
-
-+ /* flip stripe flag for the assigned stream if supported */
-+ if (get_wcaps(codec, per_cvt->cvt_nid) & AC_WCAP_STRIPE)
-+ azx_stream(get_azx_dev(substream))->stripe = 1;
-+
- snd_hda_set_dev_select(codec, per_pin->pin_nid, per_pin->dev_id);
- snd_hda_codec_write_cache(codec, per_pin->pin_nid, 0,
- AC_VERB_SET_CONNECT_SEL,
---
-2.20.1
-
-
From 418156f40c1686839ff690363a6174049cebf3e8 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 29 Nov 2019 15:40:27 +0100
@@ -12222,179 +11955,3 @@ index ff098957e30f..bc64d1565868 100644
/* VIA GFX VT7122/VX900 */
--
2.20.1
-
-
-From 0caa4b472c884305fe9412cfbab077ad043e92c4 Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Date: Wed, 20 Nov 2019 16:20:35 +0800
-Subject: [PATCH 128/130] ALSA: hda - Add mute led support for HP ProBook 645
- G4
-
-Mic mute led does not work on HP ProBook 645 G4.
-We can use CXT_FIXUP_MUTE_LED_GPIO fixup to support it.
-
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20191120082035.18937-1-kai.heng.feng@canonical.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit e190de6941db14813032af87873f5550ad5764fe)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_conexant.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
-index 968d3caab6ac..90aa0f400a57 100644
---- a/sound/pci/hda/patch_conexant.c
-+++ b/sound/pci/hda/patch_conexant.c
-@@ -910,6 +910,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
- SND_PCI_QUIRK(0x103c, 0x837f, "HP ProBook 470 G5", CXT_FIXUP_MUTE_LED_GPIO),
- SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
- SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE),
-+ SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
- SND_PCI_QUIRK(0x103c, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE),
- SND_PCI_QUIRK(0x103c, 0x8456, "HP Z2 G4 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),
- SND_PCI_QUIRK(0x103c, 0x8457, "HP Z2 G4 mini", CXT_FIXUP_HP_MIC_NO_PRESENCE),
---
-2.20.1
-
-
-From addcf5abf004336c8a1a29244a1bbcf66a08414f Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 28 Nov 2019 21:26:30 +0100
-Subject: [PATCH 129/130] ALSA: hda/realtek - Fix inverted bass GPIO pin on
- Acer 8951G
-
-We've added the bass speaker support on Acer 8951G by the commit
-00066e9733f6 ("Add Acer Aspire Ethos 8951G model quirk"), but it seems
-that the GPIO pin was wrongly set: while the commit turns off the bit
-to power up the amp, the actual hardware reacts other way round,
-i.e. GPIO bit on = amp on.
-
-So this patch fixes the bug, turning on the GPIO bit 0x02 as default.
-Since turning on the GPIO bit can be more easily managed with
-alc_setup_gpio() call, we simplify the quirk code by integrating the
-GPIO setup into the existing alc662_fixup_aspire_ethos_hp() and
-dropping the whole ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER quirk.
-
-Fixes: 00066e9733f6 ("Add Acer Aspire Ethos 8951G model quirk")
-Reported-and-tested-by: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/20191128202630.6626-1-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit 336820c4374bc065317f247dc2bb37c0e41b64a6)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_realtek.c | 17 +++--------------
- 1 file changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index a596790d4245..c84cabadaf69 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -8441,6 +8441,8 @@ static void alc662_fixup_aspire_ethos_hp(struct hda_codec *codec,
- case HDA_FIXUP_ACT_PRE_PROBE:
- snd_hda_jack_detect_enable_callback(codec, 0x1b,
- alc662_aspire_ethos_mute_speakers);
-+ /* subwoofer needs an extra GPIO setting to become audible */
-+ alc_setup_gpio(codec, 0x02);
- break;
- case HDA_FIXUP_ACT_INIT:
- /* Make sure to start in a correct state, i.e. if
-@@ -8523,7 +8525,6 @@ enum {
- ALC662_FIXUP_USI_HEADSET_MODE,
- ALC662_FIXUP_LENOVO_MULTI_CODECS,
- ALC669_FIXUP_ACER_ASPIRE_ETHOS,
-- ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER,
- ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET,
- };
-
-@@ -8855,18 +8856,6 @@ static const struct hda_fixup alc662_fixups[] = {
- .type = HDA_FIXUP_FUNC,
- .v.func = alc662_fixup_aspire_ethos_hp,
- },
-- [ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER] = {
-- .type = HDA_FIXUP_VERBS,
-- /* subwoofer needs an extra GPIO setting to become audible */
-- .v.verbs = (const struct hda_verb[]) {
-- {0x01, AC_VERB_SET_GPIO_MASK, 0x02},
-- {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x02},
-- {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
-- { }
-- },
-- .chained = true,
-- .chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET
-- },
- [ALC669_FIXUP_ACER_ASPIRE_ETHOS] = {
- .type = HDA_FIXUP_PINS,
- .v.pins = (const struct hda_pintbl[]) {
-@@ -8876,7 +8865,7 @@ static const struct hda_fixup alc662_fixups[] = {
- { }
- },
- .chained = true,
-- .chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_SUBWOOFER
-+ .chain_id = ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET
- },
- };
-
---
-2.20.1
-
-
-From 251ba1fbf100a47f2e4599dada0bf75cc8f8f65b Mon Sep 17 00:00:00 2001
-From: Kailang Yang <kailang@realtek.com>
-Date: Tue, 26 Nov 2019 17:04:23 +0800
-Subject: [PATCH 130/130] ALSA: hda/realtek - Dell headphone has noise on
- unmute for ALC236
-
-headphone have noise even the volume is very small.
-Let it fill up pcbeep hidden register to default value.
-The issue was gone.
-
-Fixes: 4344aec84bd8 ("ALSA: hda/realtek - New codec support for ALC256")
-Fixes: 736f20a70608 ("ALSA: hda/realtek - Add support for ALC236/ALC3204")
-Signed-off-by: Kailang Yang <kailang@realtek.com>
-Cc: <stable@vger.kernel.org>
-Link: https://lore.kernel.org/r/9ae47f23a64d4e41a9c81e263cd8a250@realtek.com
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
-Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
-(cherry picked from commit e1e8c1fdce8b00fce08784d9d738c60ebf598ebc)
-Bugzilla: 1772498
----
- sound/pci/hda/patch_realtek.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index c84cabadaf69..6d6e34b3b3aa 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -367,9 +367,7 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
- case 0x10ec0215:
- case 0x10ec0233:
- case 0x10ec0235:
-- case 0x10ec0236:
- case 0x10ec0255:
-- case 0x10ec0256:
- case 0x10ec0257:
- case 0x10ec0282:
- case 0x10ec0283:
-@@ -381,6 +379,11 @@ static void alc_fill_eapd_coef(struct hda_codec *codec)
- case 0x10ec0300:
- alc_update_coef_idx(codec, 0x10, 1<<9, 0);
- break;
-+ case 0x10ec0236:
-+ case 0x10ec0256:
-+ alc_write_coef_idx(codec, 0x36, 0x5757);
-+ alc_update_coef_idx(codec, 0x10, 1<<9, 0);
-+ break;
- case 0x10ec0275:
- alc_update_coef_idx(codec, 0xe, 0, 1<<0);
- break;
---
-2.20.1
-
diff --git a/crypto-user-fix-memory-leak-in-crypto_reportstat.patch b/crypto-user-fix-memory-leak-in-crypto_reportstat.patch
deleted file mode 100644
index 8779b8565..000000000
--- a/crypto-user-fix-memory-leak-in-crypto_reportstat.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From mboxrd@z Thu Jan 1 00:00:00 1970
-Return-Path: <SRS0=OvUS=X5=vger.kernel.org=linux-kernel-owner@kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
- aws-us-west-2-korg-lkml-1.web.codeaurora.org
-X-Spam-Level:
-X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED,
- DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
- HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,
- SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable
- autolearn_force=no version=3.4.0
-Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
- by smtp.lore.kernel.org (Postfix) with ESMTP id 8D752C4CED1
- for <linux-kernel@archiver.kernel.org>; Fri, 4 Oct 2019 19:35:05 +0000 (UTC)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.kernel.org (Postfix) with ESMTP id 696E721D81
- for <linux-kernel@archiver.kernel.org>; Fri, 4 Oct 2019 19:35:05 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
- dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KfPgoQZi"
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1730579AbfJDTfE (ORCPT
- <rfc822;linux-kernel@archiver.kernel.org>);
- Fri, 4 Oct 2019 15:35:04 -0400
-Received: from mail-io1-f66.google.com ([209.85.166.66]:36406 "EHLO
- mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1725932AbfJDTfE (ORCPT
- <rfc822;linux-kernel@vger.kernel.org>);
- Fri, 4 Oct 2019 15:35:04 -0400
-Received: by mail-io1-f66.google.com with SMTP id b136so16026274iof.3;
- Fri, 04 Oct 2019 12:35:03 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=gmail.com; s=20161025;
- h=from:to:cc:subject:date:message-id;
- bh=YUxdWoMjBc3fq7ZEjHVbfnvWMNYpsAW2uL8SUTPJJOk=;
- b=KfPgoQZiuCc2H7qvFQGzN/Y3EGPnFsu/TLq9CSR8tecMTpa9YL5eWsqgES34oDbm/Z
- tBCmz9oK9X/m4/+VrPKpX573tizGffhrsfpuA+Fq69Y2qLjGgld9HOjAHd01oZ83u+Oe
- IfpTdiUjqLS2q1WMSLKP4SYO6lGOL2hAK3fuICIkeFaCYYGEBCZ2DyuGyNv2KTqUkk7I
- KQb1aZ8FaukkgvjqFvRKzmxBX1EAfsP/eODyKd0CEqnIZdQbkd0Y6geyteNUOKSTNqcn
- /XpZgD+IsGXz2qWx9KTOw6csMacDX9jweaZEo3BHAZO4XGnVw+LP8rKJvYE92arFNI4q
- +LLA==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=1e100.net; s=20161025;
- h=x-gm-message-state:from:to:cc:subject:date:message-id;
- bh=YUxdWoMjBc3fq7ZEjHVbfnvWMNYpsAW2uL8SUTPJJOk=;
- b=MZTiefsa/zD0rlKyJnXaNkjhKxyXM1RPbiOfRsBzjAXppzdpVXEsMuoNuMbb7UL0XD
- StXE1INBYwfkI73zbAuORpk1uc3QBCg0KUc6/FT8QWdwM6pVw3g0pWbwPcnA3YhdqbTk
- 0XWZReG3dHpnGJ+HjFibx9C5K2a5pTK2zAXRfXgJvSLWuhLdI26dNRjOdqmwW02tAThC
- Z86x/deIZhaQiRbpDadvJVNEx7tRQ0TT1d27Rf93LQStQ5vJW01jA5g//b8D5aB1Q4md
- mqI61eE+ughOjC7Ef3gIldPML4dtt/zOjR45rFV078yk8vaefDXDqdVnXIL309NOfiRj
- iGPg==
-X-Gm-Message-State: APjAAAWuXZ3QkwcdijV+oJ20x5WQPqQsko2OjLI/I2ZE5tL5mXtDiZ9P
- Kn6oGyHFRVspaJiNUH3WmBs=
-X-Google-Smtp-Source: APXvYqxdxqTqNQ2D2g2hs/N3xw+sie1sFybvZM7Bv8s50eW0Wl4EA5uLHeMeKaifDlU11aRt9jEhKg==
-X-Received: by 2002:a5d:88d1:: with SMTP id i17mr14654011iol.235.1570217702565;
- Fri, 04 Oct 2019 12:35:02 -0700 (PDT)
-Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54])
- by smtp.googlemail.com with ESMTPSA id t8sm3372621ild.7.2019.10.04.12.35.01
- (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
- Fri, 04 Oct 2019 12:35:01 -0700 (PDT)
-From: Navid Emamdoost <navid.emamdoost@gmail.com>
-Cc: emamd001@umn.edu, kjlu@umn.edu, smccaman@umn.edu,
- Navid Emamdoost <navid.emamdoost@gmail.com>,
- Herbert Xu <herbert@gondor.apana.org.au>,
- "David S. Miller" <davem@davemloft.net>,
- linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org
-Subject: [PATCH] crypto: user - fix memory leak in crypto_reportstat
-Date: Fri, 4 Oct 2019 14:34:54 -0500
-Message-Id: <20191004193455.18348-1-navid.emamdoost@gmail.com>
-X-Mailer: git-send-email 2.17.1
-To: unlisted-recipients:; (no To-header on input)
-Sender: linux-kernel-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-kernel.vger.kernel.org>
-X-Mailing-List: linux-kernel@vger.kernel.org
-Archived-At: <https://lore.kernel.org/lkml/20191004193455.18348-1-navid.emamdoost@gmail.com/>
-List-Archive: <https://lore.kernel.org/lkml/>
-List-Post: <mailto:linux-kernel@vger.kernel.org>
-
-In crypto_reportstat, a new skb is created by nlmsg_new(). This skb is
-leaked if crypto_reportstat_alg() fails. Required release for skb is
-added.
-
-Fixes: cac5818c25d0 ("crypto: user - Implement a generic crypto statistics")
-Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
----
- crypto/crypto_user_stat.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/crypto/crypto_user_stat.c b/crypto/crypto_user_stat.c
-index 8bad88413de1..1be95432fa23 100644
---- a/crypto/crypto_user_stat.c
-+++ b/crypto/crypto_user_stat.c
-@@ -328,8 +328,10 @@ int crypto_reportstat(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
- drop_alg:
- crypto_mod_put(alg);
-
-- if (err)
-+ if (err) {
-+ kfree_skb(skb);
- return err;
-+ }
-
- return nlmsg_unicast(net->crypto_nlsk, skb, NETLINK_CB(in_skb).portid);
- }
---
-2.17.1
-
-
diff --git a/kernel.spec b/kernel.spec
index 2f9599d23..927011d58 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -89,7 +89,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -801,9 +801,6 @@ Patch500: PATCH-v2-selinux-allow-labeling-before-policy-is-loaded.patch
# https://lkml.org/lkml/2019/8/29/1772
Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch
-# CVE-2019-19071 rhbz 1774949 1774950
-Patch509: rsi-release-skb-if-rsi_prepare_beacon-fails.patch
-
# CVE-2019-19070 rhbz 1774957 1774958
Patch510: spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch
@@ -819,10 +816,6 @@ Patch513: scsi-bfa-release-allocated-memory-in-case-of-error.patch
# CVE-2019-19046 rhbz 1774988 1774989
Patch514: ipmi-Fix-memory-leak-in-__ipmi_bmc_register.patch
-# CVE-2019-19050 rhbz 1774998 1775002
-# CVE-2019-19062 rhbz 1775021 1775023
-Patch515: crypto-user-fix-memory-leak-in-crypto_reportstat.patch
-
# CVE-2019-19064 rhbz 1775010 1775011
Patch516: spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch
@@ -866,10 +859,6 @@ Patch535: 0001-libertas-fix-a-potential-NULL-pointer-dereference.patch
# rhbz 1769600
Patch536: powerpc-xive-skip-ioremap-of-ESB-pages-for-LSI-interrupts.patch
-# rhbz 1781762
-Patch537: 0001-bdev-Factor-out-bdev-revalidation-into-a-common-help.patch
-Patch538: 0002-bdev-Refresh-bdev-size-for-disks-without-partitionin.patch
-
# ALSA code from v5.5 (Intel ASoC Sound Open Firmware driver support)
Patch600: alsa-5.5.patch
@@ -2577,6 +2566,9 @@ fi
#
#
%changelog
+* Fri Dec 13 2019 Jeremy Cline <jcline@redhat.com> - 5.4.3-300
+- Linux v5.4.3
+
* Tue Dec 10 2019 Laura Abbott <labbott@redhat.com>
- Fix for DVD reading (rhbz 1781762)
diff --git a/rsi-release-skb-if-rsi_prepare_beacon-fails.patch b/rsi-release-skb-if-rsi_prepare_beacon-fails.patch
deleted file mode 100644
index 64c40f408..000000000
--- a/rsi-release-skb-if-rsi_prepare_beacon-fails.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From patchwork Sat Sep 14 00:08:11 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Navid Emamdoost <navid.emamdoost@gmail.com>
-X-Patchwork-Id: 11145515
-X-Patchwork-Delegate: kvalo@adurom.com
-Return-Path: <SRS0=yb2v=XJ=vger.kernel.org=linux-wireless-owner@kernel.org>
-Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
- [172.30.200.123])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3BDCB14DB
- for <patchwork-linux-wireless@patchwork.kernel.org>;
- Sat, 14 Sep 2019 00:08:28 +0000 (UTC)
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by mail.kernel.org (Postfix) with ESMTP id 1C8DC20692
- for <patchwork-linux-wireless@patchwork.kernel.org>;
- Sat, 14 Sep 2019 00:08:28 +0000 (UTC)
-Authentication-Results: mail.kernel.org;
- dkim=fail reason="signature verification failed" (2048-bit key)
- header.d=gmail.com header.i=@gmail.com header.b="H4ki8bM3"
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S2390814AbfINAIX (ORCPT
- <rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
- Fri, 13 Sep 2019 20:08:23 -0400
-Received: from mail-io1-f67.google.com ([209.85.166.67]:38748 "EHLO
- mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S2390793AbfINAIX (ORCPT
- <rfc822;linux-wireless@vger.kernel.org>);
- Fri, 13 Sep 2019 20:08:23 -0400
-Received: by mail-io1-f67.google.com with SMTP id k5so41134655iol.5;
- Fri, 13 Sep 2019 17:08:22 -0700 (PDT)
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=gmail.com; s=20161025;
- h=from:to:cc:subject:date:message-id;
- bh=jwG/Aiknb+UcZynbTQk90VqogFgsnd/QMY7azs6Zupc=;
- b=H4ki8bM3b9Bmty2ruf5ZSCj1ONr4jsOiep+vLMdBWcjq1+6e8umPfwLlGHYesuoz/Q
- VF5OFoRIgllqVfRh1O0ob/rthiQm73toq+PTtrX9iKlZ8u3smXrOHJ2yH7252RrvcFpT
- O3TQVuU3UKw0Am3Efn13+5jVOA3Oh/oH5UC9uNsla1kvJ3F/R6nBoiOSwOMnclPvgRSn
- vay6xtYVjr5LkBAO60l/e/agltxV8p/eNiUH2xLAV7FcQ7951+WbMmnXr40trn8HDEj4
- 6yl80zQa8B2dbLThm6nFvE462hhCUY3BrldbuGcsFiHG7iW0/cIshuHIso8SieQZdhM+
- gIzw==
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=1e100.net; s=20161025;
- h=x-gm-message-state:from:to:cc:subject:date:message-id;
- bh=jwG/Aiknb+UcZynbTQk90VqogFgsnd/QMY7azs6Zupc=;
- b=sTBiyouiK4UyXL4mE50HQlhIkI9Ns2+bLnk+9IC/vhspdjwj+xTPQI2DtQxLD94ruR
- EUXt194VEVxAqhmZQJy2MmYkPLsTxt31pXvm59EGf0bFyboMEVIx/BOWcqjS1+pOKH4I
- PisI3obo+CTL2hsat1wiEc2pMg+ZsZKzwlboyXVB0sL/FjH0xkEqAF1YC39sbegiiU6P
- PX/iDiNXMRckuIc/hvl5JA+8DFBj6onQYoXyPjRG7Ry122UQPLyu9SCSc2nGtgiv/EqM
- 0YAhTTXDm0FyknKt7MoTbOuMcDqzz/io6uTl6/oMPotLSrKVAe+8u0V/hl9WS8VvitOm
- U3xw==
-X-Gm-Message-State: APjAAAUnAd+MBw2rCpslu6F+1lT07zH7ui3l7LUI6IDQAbTwKXToMRDT
- yPjM/YAgsdE/f2RMGo4WmJhx7rwf6+4=
-X-Google-Smtp-Source:
- APXvYqw7AMJKs0y62zgNzfsmBOSndsvr5y6XtYV+6wx/T/jGH6LPa1JJmCjPhOygc0/qx3csQoLVXA==
-X-Received: by 2002:a6b:5b07:: with SMTP id v7mr3108833ioh.76.1568419702221;
- Fri, 13 Sep 2019 17:08:22 -0700 (PDT)
-Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54])
- by smtp.googlemail.com with ESMTPSA id
- t9sm3973230iop.86.2019.09.13.17.08.21
- (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
- Fri, 13 Sep 2019 17:08:21 -0700 (PDT)
-From: Navid Emamdoost <navid.emamdoost@gmail.com>
-Cc: emamd001@umn.edu, smccaman@umn.edu, kjlu@umn.edu,
- Navid Emamdoost <navid.emamdoost@gmail.com>,
- Amitkumar Karwar <amitkarwar@gmail.com>,
- Siva Rebbagondla <siva8118@gmail.com>,
- Kalle Valo <kvalo@codeaurora.org>,
- "David S. Miller" <davem@davemloft.net>,
- linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
- linux-kernel@vger.kernel.org
-Subject: [PATCH] rsi: release skb if rsi_prepare_beacon fails
-Date: Fri, 13 Sep 2019 19:08:11 -0500
-Message-Id: <20190914000812.10188-1-navid.emamdoost@gmail.com>
-X-Mailer: git-send-email 2.17.1
-To: unlisted-recipients:; (no To-header on input)
-Sender: linux-wireless-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-wireless.vger.kernel.org>
-X-Mailing-List: linux-wireless@vger.kernel.org
-
-In rsi_send_beacon, if rsi_prepare_beacon fails the allocated skb should
-be released.
-
-Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
----
- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
-index 6c7f26ef6476..9cc8a335d519 100644
---- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c
-+++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c
-@@ -1756,6 +1756,7 @@ static int rsi_send_beacon(struct rsi_common *common)
- skb_pull(skb, (64 - dword_align_bytes));
- if (rsi_prepare_beacon(common, skb)) {
- rsi_dbg(ERR_ZONE, "Failed to prepare beacon\n");
-+ dev_kfree_skb(skb);
- return -EINVAL;
- }
- skb_queue_tail(&common->tx_queue[MGMT_BEACON_Q], skb);
diff --git a/sources b/sources
index 26bb491cf..1c3dd8dfe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-SHA512 (patch-5.4.2.xz) = aba07d75524ad33cd014700a1317c450fe4ea02817dc225848187fa2a353a215011d3ab485d1900796e0797b8c145bbbf10d706ab45784cc9413dbbc96889041
+SHA512 (patch-5.4.3.xz) = 7146258dcd169552fdcc6ad02b709310e57d413be84c76061669712c840a6de3e8e104fdba763df284b465e0217a6e74435f1fb2e0faf16feb2d595193bd8a4a