From b787ad1672064b496bf250645a9d3e2403e40795 Mon Sep 17 00:00:00 2001 From: Justin Forbes Date: Dec 31 2019 22:05:02 +0000 Subject: Linux v5.4.7 --- diff --git a/0001-libertas-fix-a-potential-NULL-pointer-dereference.patch b/0001-libertas-fix-a-potential-NULL-pointer-dereference.patch deleted file mode 100644 index efdc46d..0000000 --- a/0001-libertas-fix-a-potential-NULL-pointer-dereference.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7da413a18583baaf35dd4a8eb414fa410367d7f2 Mon Sep 17 00:00:00 2001 -From: Allen Pais -Date: Wed, 18 Sep 2019 22:05:00 +0530 -Subject: [PATCH] libertas: fix a potential NULL pointer dereference - -alloc_workqueue is not checked for errors and as a result, -a potential NULL dereference could occur. - -Signed-off-by: Allen Pais -Signed-off-by: Kalle Valo ---- - drivers/net/wireless/marvell/libertas/if_sdio.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/drivers/net/wireless/marvell/libertas/if_sdio.c b/drivers/net/wireless/marvell/libertas/if_sdio.c -index 242d8845da3f..30f1025ecb9b 100644 ---- a/drivers/net/wireless/marvell/libertas/if_sdio.c -+++ b/drivers/net/wireless/marvell/libertas/if_sdio.c -@@ -1179,6 +1179,10 @@ static int if_sdio_probe(struct sdio_func *func, - - spin_lock_init(&card->lock); - card->workqueue = alloc_workqueue("libertas_sdio", WQ_MEM_RECLAIM, 0); -+ if (unlikely(!card->workqueue)) { -+ ret = -ENOMEM; -+ goto err_queue; -+ } - INIT_WORK(&card->packet_worker, if_sdio_host_to_card_worker); - init_waitqueue_head(&card->pwron_waitq); - -@@ -1230,6 +1234,7 @@ static int if_sdio_probe(struct sdio_func *func, - lbs_remove_card(priv); - free: - destroy_workqueue(card->workqueue); -+err_queue: - while (card->packets) { - packet = card->packets; - card->packets = card->packets->next; --- -2.23.0 - diff --git a/alsa-5.5.patch b/alsa-5.5.patch index e9eaa0b..18c7b49 100644 --- a/alsa-5.5.patch +++ b/alsa-5.5.patch @@ -2507,50 +2507,6 @@ index a1e514f71739..b2597ecfdc1c 100644 2.20.1 -From 5c2784a52e77957f4c7a677296369d1ef09413db Mon Sep 17 00:00:00 2001 -From: Kai Vehmanen -Date: Tue, 8 Oct 2019 11:44:35 -0500 -Subject: [PATCH 025/130] ASoC: SOF: enable sync_write in hdac_bus - -Align SOF HDA implementation with snd-hda-intel driver and enable -sync_write flag for all supported Intel platforms in SOF. When set, -a sync is issued after each verb write. - -Sync after write has helped to overcome intermittent delays in -system resume flow on Intel Coffee Lake systems, and most recently -probe errors related to the HDMI codec on Ice Lake systems. - -Matches the snd-hda-intel driver change done in commit 2756d9143aa5 -("ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips"). - -Signed-off-by: Kai Vehmanen -Signed-off-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20191008164443.1358-2-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit f3416e7144f5d4ba0fc5dcef6ebfff891266c46a) -Bugzilla: 1772498 ---- - sound/soc/sof/intel/hda.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c -index 06e84679087b..5a5163eef2ef 100644 ---- a/sound/soc/sof/intel/hda.c -+++ b/sound/soc/sof/intel/hda.c -@@ -268,6 +268,7 @@ static int hda_init(struct snd_sof_dev *sdev) - - bus->use_posbuf = 1; - bus->bdl_pos_adj = 0; -+ bus->sync_write = 1; - - mutex_init(&hbus->prepare_mutex); - hbus->pci = pci; --- -2.20.1 - - From e1cc39fb37b304910435e08907d9bd3f29636b89 Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Tue, 8 Oct 2019 11:44:41 -0500 @@ -5043,65 +4999,6 @@ index 56a3ab66b46b..6435eb531668 100644 2.20.1 -From 34edfaf5c61574b5156daeb173476650be7b87a0 Mon Sep 17 00:00:00 2001 -From: Pierre-Louis Bossart -Date: Fri, 1 Nov 2019 12:30:39 -0500 -Subject: [PATCH 050/130] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF - dependency - -updated solution to the problem reported with randconfig: - -CONFIG_SND_SOC_SOF_IMX depends on CONFIG_SND_SOC_SOF, but is in -turn referenced by the sof-of-dev driver. This creates a reverse -dependency that manifests in a link error when CONFIG_SND_SOC_SOF_OF -is built-in but CONFIG_SND_SOC_SOF_IMX=m: - -sound/soc/sof/sof-of-dev.o:(.data+0x118): undefined reference to `sof_imx8_ops' - -use def_trisate to propagate the right settings without select. - -Fixes: f4df4e4042b0 ("ASoC: SOF: imx8: Fix COMPILE_TEST error") -Fixes: 202acc565a1f ("ASoC: SOF: imx: Add i.MX8 HW support") -Suggested-by: Arnd Bergmann -Signed-off-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20191101173045.27099-6-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit f9ad75468453b019b92c5296e6a04bf7c37f49e4) -Bugzilla: 1772498 ---- - sound/soc/sof/imx/Kconfig | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig -index 5acae75f5750..71f318bc2c74 100644 ---- a/sound/soc/sof/imx/Kconfig -+++ b/sound/soc/sof/imx/Kconfig -@@ -11,8 +11,8 @@ config SND_SOC_SOF_IMX_TOPLEVEL - - if SND_SOC_SOF_IMX_TOPLEVEL - --config SND_SOC_SOF_IMX8 -- tristate "SOF support for i.MX8" -+config SND_SOC_SOF_IMX8_SUPPORT -+ bool "SOF support for i.MX8" - depends on IMX_SCU - depends on IMX_DSP - help -@@ -20,4 +20,8 @@ config SND_SOC_SOF_IMX8 - Say Y if you have such a device. - If unsure select "N". - -+config SND_SOC_SOF_IMX8 -+ def_tristate SND_SOC_SOF_OF -+ depends on SND_SOC_SOF_IMX8_SUPPORT -+ - endif ## SND_SOC_SOF_IMX_IMX_TOPLEVEL --- -2.20.1 - - From 5efd9ba11e644ef74a0c51d543145f116a886438 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 1 Nov 2019 12:30:40 -0500 @@ -10043,47 +9940,6 @@ index ad798fb3bb32..d4aea5422ea8 100644 2.20.1 -From b0ba4b0be937405c5982db296e5d9e57a9239c5a Mon Sep 17 00:00:00 2001 -From: Ranjani Sridharan -Date: Mon, 4 Nov 2019 14:48:12 -0800 -Subject: [PATCH 099/130] ASoC: SOF: topology: set trigger order for FE DAI - link - -Set trigger order for FE DAI links to SND_SOC_DPCM_TRIGGER_POST -to trigger the BE DAI's before the FE DAI's. This prevents the -xruns seen on playback pipelines using the link DMA. - -Signed-off-by: Ranjani Sridharan -Signed-off-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20191104224812.3393-3-ranjani.sridharan@linux.intel.com -Signed-off-by: Mark Brown - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 5eee2b3f60065a2530d13f28e771be48b989eb4c) -Bugzilla: 1772498 ---- - sound/soc/sof/topology.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c -index d4aea5422ea8..143b8259a70a 100644 ---- a/sound/soc/sof/topology.c -+++ b/sound/soc/sof/topology.c -@@ -2952,6 +2952,10 @@ static int sof_link_load(struct snd_soc_component *scomp, int index, - if (!link->no_pcm) { - link->nonatomic = true; - -+ /* set trigger order */ -+ link->trigger[0] = SND_SOC_DPCM_TRIGGER_POST; -+ link->trigger[1] = SND_SOC_DPCM_TRIGGER_POST; -+ - /* nothing more to do for FE dai links */ - return 0; - } --- -2.20.1 - - From 00e0accc297d44a65b09af38a2d6813467f5b8e9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Nov 2019 18:49:32 +0100 @@ -11391,47 +11247,6 @@ index eeb9a11e4e14..b2475e3eff7b 100644 2.20.1 -From 4ed26c72c431638378a523c30aea7842a84b48d7 Mon Sep 17 00:00:00 2001 -From: Yu-Hsuan Hsu -Date: Tue, 24 Sep 2019 00:29:40 +0800 -Subject: [PATCH 120/130] ASoC: Intel: kbl_rt5663_rt5514_max98927: Add dmic - format constraint - -On KBL platform, the microphone is attached to external codec(rt5514) -instead of PCH. However, TDM slot between PCH and codec is 16 bits only. -In order to avoid setting wrong format, we should add a constraint to -force to use 16 bits format forever. - -Signed-off-by: Yu-Hsuan Hsu -Acked-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20190923162940.199580-1-yuhsuan@chromium.org -Signed-off-by: Mark Brown - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit e2db787bdcb4f2722ecf410168f0583764634e45) -Bugzilla: 1772498 ---- - sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c -index a1056cda3dd7..3e5f6bead229 100644 ---- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c -+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c -@@ -465,6 +465,9 @@ static int kabylake_dmic_startup(struct snd_pcm_substream *substream) - snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS, - dmic_constraints); - -+ runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE; -+ snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16); -+ - return snd_pcm_hw_constraint_list(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, &constraints_rates); - } --- -2.20.1 - - From 0305b5a5db77305fc43a76efd39aed84c5561f96 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Mon, 11 Nov 2019 16:28:59 -0600 @@ -11635,57 +11450,6 @@ index 16d0bae8b316..27588841c8b0 100644 2.20.1 -From 5013754204158edfa1252330c1120226af2dca7f Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Tue, 19 Nov 2019 15:51:38 +0100 -Subject: [PATCH 122/130] ASoC: Intel: bytcr_rt5640: Update quirk for Acer - Switch 10 SW5-012 2-in-1 - -When the Acer Switch 10 SW5-012 quirk was added we did not have -jack-detection support yet; and the builtin microphone selection of -the original quirk is wrong too. - -Fix the microphone-input quirk and add jack-detection info so that the -internal-microphone and headphone/set jack on the Switch 10 work properly. - -Signed-off-by: Hans de Goede -Reviewed-by: Andy Shevchenko -Acked-by: Pierre-Louis Bossart -Link: https://lore.kernel.org/r/20191119145138.59162-1-hdegoede@redhat.com -Signed-off-by: Mark Brown - -Signed-off-by: Jaroslav Kysela -(cherry picked from commit 0bb887709eb16bdc4b5baddd8337abf3de72917f) -Bugzilla: 1772498 ---- - sound/soc/intel/boards/bytcr_rt5640.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c -index 9c1aa4ec9cba..dd2b5ad08659 100644 ---- a/sound/soc/intel/boards/bytcr_rt5640.c -+++ b/sound/soc/intel/boards/bytcr_rt5640.c -@@ -405,10 +405,12 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"), - }, -- .driver_data = (void *)(BYT_RT5640_IN1_MAP | -- BYT_RT5640_MCLK_EN | -- BYT_RT5640_SSP0_AIF1), -- -+ .driver_data = (void *)(BYT_RT5640_DMIC1_MAP | -+ BYT_RT5640_JD_SRC_JD2_IN4N | -+ BYT_RT5640_OVCD_TH_2000UA | -+ BYT_RT5640_OVCD_SF_0P75 | -+ BYT_RT5640_SSP0_AIF1 | -+ BYT_RT5640_MCLK_EN), - }, - { - .matches = { --- -2.20.1 - - From 418156f40c1686839ff690363a6174049cebf3e8 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 29 Nov 2019 15:40:27 +0100 diff --git a/kernel.spec b/kernel.spec index c1a7b52..c00d7da 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 6 +%define stable_update 7 # 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-19070 rhbz 1774957 1774958 -Patch510: spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch - # CVE-2019-19068 rhbz 1774963 1774965 Patch511: rtl8xxxu-prevent-leaking-urb.patch @@ -819,12 +816,6 @@ Patch514: ipmi-Fix-memory-leak-in-__ipmi_bmc_register.patch # CVE-2019-19064 rhbz 1775010 1775011 Patch516: spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch -# CVE-2019-19063 rhbz 1775015 1775016 -Patch517: rtlwifi-prevent-memory-leak-in-rtl_usb_probe.patch - -# CVE-2019-19057 rhbz 1775050 1775051 -Patch520: mwifiex-pcie-Fix-memory-leak-in-mwifiex_pcie_init_evt_ring.patch - # CVE-2019-19053 rhbz 1775956 1775110 Patch521: rpmsg-char-release-allocated-memory.patch @@ -853,9 +844,6 @@ Patch531: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch # CVE-2019-18809 rhbz 1777449 1777451 Patch532: 0001-media-usb-fix-memory-leak-in-af9005_identify_state.patch -# CVE-2019-16232 rhbz 1760351 1760352 -Patch535: 0001-libertas-fix-a-potential-NULL-pointer-dereference.patch - # ALSA code from v5.5 (Intel ASoC Sound Open Firmware driver support) Patch600: alsa-5.5.patch @@ -2567,6 +2555,9 @@ fi # # %changelog +* Tue Dec 31 2019 Justin M. Forbes - 5.4.7-200 +- Linux v5.4.7 + * Mon Dec 23 2019 Justin M. Forbes - 5.4.6-300 - Linux v5.4.6 - Fix rhbz 1781288 diff --git a/mwifiex-pcie-Fix-memory-leak-in-mwifiex_pcie_init_evt_ring.patch b/mwifiex-pcie-Fix-memory-leak-in-mwifiex_pcie_init_evt_ring.patch deleted file mode 100644 index b606e1c..0000000 --- a/mwifiex-pcie-Fix-memory-leak-in-mwifiex_pcie_init_evt_ring.patch +++ /dev/null @@ -1,111 +0,0 @@ -From patchwork Fri Oct 4 20:16:48 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Navid Emamdoost -X-Patchwork-Id: 11175265 -X-Patchwork-Delegate: kvalo@adurom.com -Return-Path: -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 8B95B16B1 - for ; - Fri, 4 Oct 2019 20:17:03 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 695CE222BE - for ; - Fri, 4 Oct 2019 20:17:03 +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="eKzyOkdw" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1731313AbfJDUQ7 (ORCPT - ); - Fri, 4 Oct 2019 16:16:59 -0400 -Received: from mail-io1-f66.google.com ([209.85.166.66]:38177 "EHLO - mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1727978AbfJDUQ7 (ORCPT - ); - Fri, 4 Oct 2019 16:16:59 -0400 -Received: by mail-io1-f66.google.com with SMTP id u8so16270784iom.5; - Fri, 04 Oct 2019 13:16:59 -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=hT/oExY7ats1AqepuNnxgrg+W5xUde0ZFah/AwhjxeA=; - b=eKzyOkdwTVgDQ2K7yVdvbQpQ2Y5o9gQHjf1ZLs/0TtknuoSEf88gRE3B/VgSXRe2nM - MaPWiP+DFmtmMOa4V+/fIXuzmU7h0LfbH92QwqYCh6xpzlPF6Y4etarqtYGFwcN8YIFh - KTbhy9t0/3m87L4UKRDIPV+aiyoEDLA1YrY+pxytqsh/8wTp82JG4WTVt4pgwk2YsDFT - TYQK7y3xY2D8O2nwUROYE+zlwF6oua9EA/ixXRVx4CRlh/lRFc124Qw5TlMD2GZdMIPJ - 3GHq32K5Z1F8XMQnUSU6+WxybmUN18B736DtQMDHjjnt70M8oCb/qgoMbH3Bx6xDBx4t - mwIQ== -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=hT/oExY7ats1AqepuNnxgrg+W5xUde0ZFah/AwhjxeA=; - b=OCKRhcqw7kz4tZ/5U2VB84zj0RK/HtQHQ0/BUR0GLJMYOM7HJ1WBdSXnPtJs7UfIX1 - +C4Eq7PaUUpYg+OTWL+BOB7HpPh2AWvmoN/pElS49IYwKCcF9gUb/yfz1ZPSZBZrILg5 - pLgkiiBqoKOaUgVMzBGUs53mAhE7h0RuUDK3i3lptARoQDhVnRCk3HW6uz9G1pjCG6+m - nOC9rnGsphMQZ30AbdG6u8z1oVH+F63nWumldsiz4sNMs++qwDXS5a9ho2EjS9cZwCnL - c3V0vn5HgDqWWVwakE75xEnYAmApdEOC+BtAw6/zMFPMGWoDI98gN1u2ej7Ig6VZ3sDY - GmXA== -X-Gm-Message-State: APjAAAUvXc/AEaa09LdQbBGOHXwA82YLzxvRaRqZB1BY9YQoSNU4yJRa - 7zybbZ/DYfKfmszLK0NP4Vs= -X-Google-Smtp-Source: - APXvYqzNrXPxTps0mq67LtrgFhdE+kz3sXZyk7jqXZoSLFBjfwzONVFvHnNSmdK/pmDZR02HMuSgCw== -X-Received: by 2002:a6b:6e02:: with SMTP id d2mr5637516ioh.8.1570220218662; - Fri, 04 Oct 2019 13:16:58 -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 - o5sm2830180ilc.68.2019.10.04.13.16.57 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Fri, 04 Oct 2019 13:16:58 -0700 (PDT) -From: Navid Emamdoost -Cc: emamd001@umn.edu, kjlu@umn.edu, smccaman@umn.edu, - Navid Emamdoost , - Amitkumar Karwar , - Nishant Sarmukadam , - Ganapathi Bhat , - Xinming Hu , - Kalle Valo , - "David S. Miller" , - linux-wireless@vger.kernel.org, netdev@vger.kernel.org, - linux-kernel@vger.kernel.org -Subject: [PATCH] mwifiex: pcie: Fix memory leak in mwifiex_pcie_init_evt_ring -Date: Fri, 4 Oct 2019 15:16:48 -0500 -Message-Id: <20191004201649.25087-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: -X-Mailing-List: linux-wireless@vger.kernel.org - -In mwifiex_pcie_init_evt_ring, a new skb is allocated which should be -released if mwifiex_map_pci_memory() fails. The release for skb and -card->evtbd_ring_vbase is added. - -Fixes: 0732484b47b5 ("mwifiex: separate ring initialization and ring creation routines") -Signed-off-by: Navid Emamdoost -Acked-by: Ganapathi Bhat ---- - drivers/net/wireless/marvell/mwifiex/pcie.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c -index eff06d59e9df..096334e941a1 100644 ---- a/drivers/net/wireless/marvell/mwifiex/pcie.c -+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c -@@ -687,8 +687,11 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter) - skb_put(skb, MAX_EVENT_SIZE); - - if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE, -- PCI_DMA_FROMDEVICE)) -+ PCI_DMA_FROMDEVICE)) { -+ kfree_skb(skb); -+ kfree(card->evtbd_ring_vbase); - return -1; -+ } - - buf_pa = MWIFIEX_SKB_DMA_ADDR(skb); - diff --git a/sources b/sources index 1d8e238..f5f8ddc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.4.6.xz) = 6f6d73c7ce71d47e810847149f4c258f5fb99c98fc67d385a3ff74889543a415bf8bb77c748a13f72b733bca770773731d84713a9be98d630b7377a792f11f5a +SHA512 (patch-5.4.7.xz) = 396eaf9fe88045e6e308cbe8e72217b3334b637bfa7e85f8d27cc4dd8e3d94c6f58d2b7b3e237defcf647d500610b85780ec2e21f1d91ac41c5f4ef3e74dc161 diff --git a/spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch b/spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch deleted file mode 100644 index e0a79cf..0000000 --- a/spi-gpio-prevent-memory-leak-in-spi_gpio_probe.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d3b0ffa1d75d5305ebe34735598993afbb8a869d Mon Sep 17 00:00:00 2001 -From: Navid Emamdoost -Date: Mon, 30 Sep 2019 15:52:40 -0500 -Subject: spi: gpio: prevent memory leak in spi_gpio_probe - -In spi_gpio_probe an SPI master is allocated via spi_alloc_master, but -this controller should be released if devm_add_action_or_reset fails, -otherwise memory leaks. In order to avoid leak spi_contriller_put must -be called in case of failure for devm_add_action_or_reset. - -Fixes: 8b797490b4db ("spi: gpio: Make sure spi_master_put() is called in every error path") -Signed-off-by: Navid Emamdoost -Link: https://lore.kernel.org/r/20190930205241.5483-1-navid.emamdoost@gmail.com -Signed-off-by: Mark Brown ---- - drivers/spi/spi-gpio.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -(limited to 'drivers/spi/spi-gpio.c') - -diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c -index 1d3e23ec20a6..f9c5bbb74714 100644 ---- a/drivers/spi/spi-gpio.c -+++ b/drivers/spi/spi-gpio.c -@@ -371,8 +371,10 @@ static int spi_gpio_probe(struct platform_device *pdev) - return -ENOMEM; - - status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master); -- if (status) -+ if (status) { -+ spi_master_put(master); - return status; -+ } - - if (of_id) - status = spi_gpio_probe_dt(pdev, master); --- -cgit 1.2-0.3.lf.el7 -