diff options
| -rw-r--r-- | ath10k-fix-memory-leak.patch | 154 | ||||
| -rw-r--r-- | kernel.spec | 28 | ||||
| -rw-r--r-- | mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch | 129 | ||||
| -rw-r--r-- | mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_alloc_cmdrsp_buf.patch | 109 | ||||
| -rw-r--r-- | rpmsg-char-release-allocated-memory.patch | 103 | ||||
| -rw-r--r-- | rtl8xxxu-prevent-leaking-urb.patch | 101 | ||||
| -rw-r--r-- | scsi-bfa-release-allocated-memory-in-case-of-error.patch | 105 | ||||
| -rw-r--r-- | sources | 2 | ||||
| -rw-r--r-- | tpm-handle-negative-priv--response_len-in-tpm_common_read.patch | 89 |
9 files changed, 6 insertions, 814 deletions
diff --git a/ath10k-fix-memory-leak.patch b/ath10k-fix-memory-leak.patch deleted file mode 100644 index f7120b81f..000000000 --- a/ath10k-fix-memory-leak.patch +++ /dev/null @@ -1,154 +0,0 @@ -From patchwork Fri Sep 20 01:36:26 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: 11153701 -Return-Path: - <SRS0=bWbZ=XP=lists.infradead.org=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@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 D3F0714DB - for <patchwork-ath10k@patchwork.kernel.org>; - Fri, 20 Sep 2019 01:36:54 +0000 (UTC) -Received: from bombadil.infradead.org (bombadil.infradead.org - [198.137.202.133]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id B1A2E206C2 - for <patchwork-ath10k@patchwork.kernel.org>; - Fri, 20 Sep 2019 01:36:54 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="bhsKgarK"; - dkim=fail reason="signature verification failed" (2048-bit key) - header.d=gmail.com header.i=@gmail.com header.b="nljLTTHa" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1A2E206C2 -Authentication-Results: mail.kernel.org; - dmarc=fail (p=none dis=none) header.from=gmail.com -Authentication-Results: mail.kernel.org; - spf=none - smtp.mailfrom=ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=lists.infradead.org; s=bombadil.20170209; h=Sender: - Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: - List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: - Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: - Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: - References:List-Owner; bh=TgqIPzTUSDBMffxK6MmqtQ+I81SfWmrbmWLuWLbhwV8=; b=bhs - KgarKUaVoFaf/6TPo+T+LIemPUgT0DioZ9Aa4cXD7m02vV5SrBodW911B9amgDGQ4ipx7UyAgOokS - QqumgU8MLbC9VEmDHseDYkrMDJvPAVL/+Ou5bAAoDDa4G14hJi1RWh5lsdIJBMKmjMI9KcW7qFdEj - eQ6JBoJXliaYp31BoAPEbyBnG4b8RQxO6wT9wA+/Bs8gR8bBQN9Wjo7zsIKHobQbKfAXTTRwn46dt - J7kt19264hkIv2Dr3UQc7W8kYL09TmllYFjEGYTOuGFEOoHlejt6CpbUnh0mdPtDggPPxsQ+e/f/h - 0dGNUqgR/L7R5/70DbHnF24DnXzwfQw==; -Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) - by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) - id 1iB7qu-0006An-U6; Fri, 20 Sep 2019 01:36:52 +0000 -Received: from mail-io1-xd43.google.com ([2607:f8b0:4864:20::d43]) - by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) - id 1iB7qr-0006A2-PC - for ath10k@lists.infradead.org; Fri, 20 Sep 2019 01:36:51 +0000 -Received: by mail-io1-xd43.google.com with SMTP id q10so12531160iop.2 - for <ath10k@lists.infradead.org>; Thu, 19 Sep 2019 18:36:47 -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=2vkYM2Vw9GpvccAiSSIMhifEzfuK8Ld4R3bwXVgh1ps=; - b=nljLTTHaQr3RenMHyxOGrtAwE/I0ES0GK9UJLdYkS7iEalzRrwu+/ygif0A/YnEFuE - fMLFG5zBRN2I7SpqvTBqaxAYJbA+a5Nnb5ymeV3s6Ef+CcGHE165IRfi+4dxEt/RvV3k - 4CjBDTDWGnnBO1wfDcS0WW9TqjJEoxFKWNCL+8oAzUyMten4zs8XPRUPlZVc5dHnkqC9 - LmLWnaSBjm2g5JG0GJKSrT8KrYP2mv4yGUR0HaWruQWwfQQ8NJc2RyXm1Ml99KZkoU73 - TG98jQSy2dcHrVqaNRfpAtyj0WEwXdLqMfT1ggk69p1ZfC7ol/7QEQxzgDIU0EFn2r59 - owvA== -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=2vkYM2Vw9GpvccAiSSIMhifEzfuK8Ld4R3bwXVgh1ps=; - b=h6uidvjJA/lvtevOi6n+lWV9vjtx5XM1d7kRlAFgObUBjJMIap329Jxa7uA0de8dx/ - 4ANBCQj9/8psgTYwWqBv0bJH+7IC+ewxZb2m3z1dMYwsFp8coTyMryaBVWb4trh0My3B - XT2OseKTL0iAiy35/SDbWV/5FljTuVmto5Jgglq6lB3uPpQVIGu46UY8kNKwuIdNseow - y4r+4w82KCHMoANJmlEPlFYb7xnmENPIdx0ZITs6ISjjvTICaf8nyA3OgqPCI5l3/DCb - 3plewsEuTwGiFXPqJx2ldY3gIwfH8D7w1MLxadUUL6o2fDRt0ZjFbJuUk/tiX/EM5MOL - W3dQ== -X-Gm-Message-State: APjAAAWIX+IMQ2tM7gV9yX2n6iqisUO1ysXCEYfl/P1BcWwlYgTk8xNq - /djn9P594uwGss08Ku8JA9E= -X-Google-Smtp-Source: - APXvYqzLPqJkNUviwDSfcaSYJH+eUFOLc0fBeZpgji797e/U5UAY6XAi9Cq7iKldElsnElvAmFWNCw== -X-Received: by 2002:a6b:8f15:: with SMTP id r21mr3490587iod.259.1568943406715; - Thu, 19 Sep 2019 18:36:46 -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 x12sm335602ioh.76.2019.09.19.18.36.45 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Thu, 19 Sep 2019 18:36:45 -0700 (PDT) -From: Navid Emamdoost <navid.emamdoost@gmail.com> -To: -Subject: [PATCH] ath10k: fix memory leak -Date: Thu, 19 Sep 2019 20:36:26 -0500 -Message-Id: <20190920013632.30796-1-navid.emamdoost@gmail.com> -X-Mailer: git-send-email 2.17.1 -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20190919_183649_845813_A1A80F7F -X-CRM114-Status: UNSURE ( 7.25 ) -X-CRM114-Notice: Please train this message. -X-Spam-Score: -0.2 (/) -X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: - Content analysis details: (-0.2 points) - pts rule name description - ---- ---------------------- - -------------------------------------------------- - -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, - no trust [2607:f8b0:4864:20:0:0:0:d43 listed in] - [list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record - -0.0 SPF_PASS SPF: sender matches SPF record - 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail - provider (navid.emamdoost[at]gmail.com) - -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature - -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from - author's domain - -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from - envelope-from domain - 0.1 DKIM_SIGNED Message has a DKIM or DK signature, - not necessarily - valid -X-BeenThere: ath10k@lists.infradead.org -X-Mailman-Version: 2.1.29 -Precedence: list -List-Id: <ath10k.lists.infradead.org> -List-Unsubscribe: <http://lists.infradead.org/mailman/options/ath10k>, - <mailto:ath10k-request@lists.infradead.org?subject=unsubscribe> -List-Archive: <http://lists.infradead.org/pipermail/ath10k/> -List-Post: <mailto:ath10k@lists.infradead.org> -List-Help: <mailto:ath10k-request@lists.infradead.org?subject=help> -List-Subscribe: <http://lists.infradead.org/mailman/listinfo/ath10k>, - <mailto:ath10k-request@lists.infradead.org?subject=subscribe> -Cc: linux-wireless@vger.kernel.org, kjlu@umn.edu, - linux-kernel@vger.kernel.org, - ath10k@lists.infradead.org, emamd001@umn.edu, smccaman@umn.edu, - netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>, - Kalle Valo <kvalo@codeaurora.org>, - Navid Emamdoost <navid.emamdoost@gmail.com> -MIME-Version: 1.0 -Sender: "ath10k" <ath10k-bounces@lists.infradead.org> -Errors-To: - ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org - -In ath10k_usb_hif_tx_sg the allocated urb should be released if -usb_submit_urb fails. - -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> ---- - drivers/net/wireless/ath/ath10k/usb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c -index e1420f67f776..730ed22e08a0 100644 ---- a/drivers/net/wireless/ath/ath10k/usb.c -+++ b/drivers/net/wireless/ath/ath10k/usb.c -@@ -435,6 +435,7 @@ static int ath10k_usb_hif_tx_sg(struct ath10k *ar, u8 pipe_id, - ath10k_dbg(ar, ATH10K_DBG_USB_BULK, - "usb bulk transmit failed: %d\n", ret); - usb_unanchor_urb(urb); -+ usb_free_urb(urb); - ret = -EINVAL; - goto err_free_urb_to_pipe; - } diff --git a/kernel.spec b/kernel.spec index a1df5139f..7c96b7946 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 202 +%global baserelease 200 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -89,7 +89,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 11 +%define stable_update 12 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -801,46 +801,25 @@ Patch503: KEYS-Make-use-of-platform-keyring-for-module-signature.patch # https://lkml.org/lkml/2019/8/29/1772 Patch504: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch -# CVE-2019-19068 rhbz 1774963 1774965 -Patch511: rtl8xxxu-prevent-leaking-urb.patch - # CVE-2019-19043 rhbz 1774972 1774973 Patch512: net-next-v2-9-9-i40e-prevent-memory-leak-in-i40e_setup_macvlans.patch -# CVE-2019-19066 rhbz 1774976 1774978 -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-19064 rhbz 1775010 1775011 Patch515: spi-lpspi-fix-memory-leak-in-fsl_lpspi_probe.patch -# CVE-2019-19053 rhbz 1775956 1775110 -Patch521: rpmsg-char-release-allocated-memory.patch - -# CVE-2019-19056 rhbz 1775097 1775115 -Patch522: mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_alloc_cmdrsp_buf.patch - # CVE-2019-19054 rhbz 1775063 1775117 Patch523: media-rc-prevent-memory-leak-in-cx23888_ir_probe.patch -# CVE-2019-14895 rhbz 1774870 1776139 -Patch524: mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch - # CVE-2019-14896 rhbz 1774875 1776143 # CVE-2019-14897 rhbz 1774879 1776146 Patch525: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch -# CVE-2019-19078 rhbz 1776354 1776353 -Patch526: ath10k-fix-memory-leak.patch - # CVE-2019-18808 rhbz 1777418 1777421 Patch527: 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch -# rhbz 1788653 -Patch530: tpm-handle-negative-priv--response_len-in-tpm_common_read.patch - # https://gitlab.freedesktop.org/drm/intel/issues/673 Patch531: drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch @@ -2541,6 +2520,9 @@ fi # # %changelog +* Tue Jan 14 2020 Jeremy Cline <jcline@redhat.com> - 5.4.12-200 +- Linux v5.4.12 + * Mon Jan 13 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.4.10-202 - Add Documentation back to kernel-devel as it has Kconfig now (rhbz 1789641) diff --git a/mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch b/mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch deleted file mode 100644 index c006a9b2c..000000000 --- a/mwifiex-fix-possible-heap-overflow-in-mwifiex_process_country_ie.patch +++ /dev/null @@ -1,129 +0,0 @@ -From patchwork Thu Nov 21 16:04:38 2019 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Ganapathi Bhat <gbhat@marvell.com> -X-Patchwork-Id: 11256477 -X-Patchwork-Delegate: kvalo@adurom.com -Return-Path: <SRS0=bi0l=ZN=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 AAABF138C - for <patchwork-linux-wireless@patchwork.kernel.org>; - Thu, 21 Nov 2019 16:04:48 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 8950220637 - for <patchwork-linux-wireless@patchwork.kernel.org>; - Thu, 21 Nov 2019 16:04:48 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=marvell.com header.i=@marvell.com - header.b="nkGygBtm" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727141AbfKUQEs (ORCPT - <rfc822;patchwork-linux-wireless@patchwork.kernel.org>); - Thu, 21 Nov 2019 11:04:48 -0500 -Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:6582 "EHLO - mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) - by vger.kernel.org with ESMTP id S1726980AbfKUQEr (ORCPT - <rfc822;linux-wireless@vger.kernel.org>); - Thu, 21 Nov 2019 11:04:47 -0500 -Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) - by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id - xALFu718003199; - Thu, 21 Nov 2019 08:04:44 -0800 -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; - h=from : to : cc : - subject : date : message-id : mime-version : content-type; s=pfpt0818; - bh=o/oIGGHPmwt5MFTKPl2GcISKabBWhPBOdPXPhlV+8H8=; - b=nkGygBtmdc1LxIp0VzpsKssm8mQFI+syng1Rek/N5Fx3Vz4o2KAlRceJkhXNdV7WpjTG - XDtRj/LiYd+OAIqSLM6J2VNtOKOhaNSDydtTUnIi4imHPzYoAdESDQW5aFV8JKZqOfYx - 0oQTjw6AhdjJCsngL+bImzmnJoZsc2gUu3BAic/kW+6Uj0JCgQwoUFBH9rNaO+Q33BY+ - dZy9MdKD905LxSBE7A5xWx5GEgrqRcvfxSOu2K78FQhsJ20suhvWSobxpYE0LIrajl6s - oQGuDbTsdOO/8v7D9Xn7zObUH6qZ08AMxDZNaBLqiKpjFY/RA7LbR2eulwEnhjCLDQfK uA== -Received: from sc-exch03.marvell.com ([199.233.58.183]) - by mx0b-0016f401.pphosted.com with ESMTP id 2wd090yntp-1 - (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); - Thu, 21 Nov 2019 08:04:44 -0800 -Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com - (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 21 Nov - 2019 08:04:43 -0800 -Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com - (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend - Transport; Thu, 21 Nov 2019 08:04:43 -0800 -Received: from testmailhost.marvell.com (testmailhost.marvell.com - [10.31.130.105]) - by maili.marvell.com (Postfix) with ESMTP id 898743F703F; - Thu, 21 Nov 2019 08:04:40 -0800 (PST) -From: Ganapathi Bhat <gbhat@marvell.com> -To: <linux-wireless@vger.kernel.org> -CC: Cathy Luo <cluo@marvell.com>, Zhiyuan Yang <yangzy@marvell.com>, - James Cao <jcao@marvell.com>, - Rakesh Parmar <rakeshp@marvell.com>, - Brian Norris <briannorris@chromium.org>, - Mohammad Tausif Siddiqui <msiddiqu@redhat.com>, - huangwen <huangwenabc@gmail.com>, - Ganapathi Bhat <gbhat@marvell.com> -Subject: [PATCH] mwifiex: fix possible heap overflow in - mwifiex_process_country_ie() -Date: Thu, 21 Nov 2019 21:34:38 +0530 -Message-ID: <1574352278-7592-1-git-send-email-gbhat@marvell.com> -X-Mailer: git-send-email 1.9.1 -MIME-Version: 1.0 -X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 - definitions=2019-11-21_03:2019-11-21,2019-11-21 signatures=0 -Sender: linux-wireless-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-wireless.vger.kernel.org> -X-Mailing-List: linux-wireless@vger.kernel.org - -mwifiex_process_country_ie() function parse elements of bss -descriptor in beacon packet. When processing WLAN_EID_COUNTRY -element, there is no upper limit check for country_ie_len before -calling memcpy. The destination buffer domain_info->triplet is an -array of length MWIFIEX_MAX_TRIPLET_802_11D(83). The remote -attacker can build a fake AP with the same ssid as real AP, and -send malicous beacon packet with long WLAN_EID_COUNTRY elemen -(country_ie_len > 83). Attacker can force STA connect to fake AP -on a different channel. When the victim STA connects to fake AP, -will trigger the heap buffer overflow. Fix this by checking for -length and if found invalid, don not connect to the AP. - -This fix addresses CVE-2019-14895. - -Reported-by: huangwen <huangwenabc@gmail.com> -Signed-off-by: Ganapathi Bhat <gbhat@marvell.com> ---- - drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 13 +++++++++++-- - 1 file changed, 11 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c -index 74e5056..6dd835f 100644 ---- a/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c -+++ b/drivers/net/wireless/marvell/mwifiex/sta_ioctl.c -@@ -229,6 +229,14 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv, - "11D: skip setting domain info in FW\n"); - return 0; - } -+ -+ if (country_ie_len > -+ (IEEE80211_COUNTRY_STRING_LEN + MWIFIEX_MAX_TRIPLET_802_11D)) { -+ mwifiex_dbg(priv->adapter, ERROR, -+ "11D: country_ie_len overflow!, deauth AP\n"); -+ return -EINVAL; -+ } -+ - memcpy(priv->adapter->country_code, &country_ie[2], 2); - - domain_info->country_code[0] = country_ie[2]; -@@ -272,8 +280,9 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, - priv->scan_block = false; - - if (bss) { -- if (adapter->region_code == 0x00) -- mwifiex_process_country_ie(priv, bss); -+ if (adapter->region_code == 0x00 && -+ mwifiex_process_country_ie(priv, bss)) -+ return -EINVAL; - - /* Allocate and fill new bss descriptor */ - bss_desc = kzalloc(sizeof(struct mwifiex_bssdescriptor), diff --git a/mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_alloc_cmdrsp_buf.patch b/mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_alloc_cmdrsp_buf.patch deleted file mode 100644 index 5c12cb493..000000000 --- a/mwifiex-pcie-fix-memory-leak-in-mwifiex_pcie_alloc_cmdrsp_buf.patch +++ /dev/null @@ -1,109 +0,0 @@ -From mboxrd@z Thu Jan 1 00:00:00 1970 -Return-Path: <SRS0=wkwR=X5=vger.kernel.org=netdev-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 973EDC47404 - for <netdev@archiver.kernel.org>; Fri, 4 Oct 2019 20:09:06 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 700B62133F - for <netdev@archiver.kernel.org>; Fri, 4 Oct 2019 20:09:06 +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="kWRjsMO7" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1731310AbfJDUJE (ORCPT <rfc822;netdev@archiver.kernel.org>); - Fri, 4 Oct 2019 16:09:04 -0400 -Received: from mail-io1-f68.google.com ([209.85.166.68]:42107 "EHLO - mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1729079AbfJDUJD (ORCPT - <rfc822;netdev@vger.kernel.org>); Fri, 4 Oct 2019 16:09:03 -0400 -Received: by mail-io1-f68.google.com with SMTP id n197so16151518iod.9; - Fri, 04 Oct 2019 13:09: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=TzGHd63YhhSYgCiRZ9tl0C+QqBhc3B9t1YurdXMHHEk=; - b=kWRjsMO7kWGMm/IT1zcaML7wX7Qq9Yq8WRm+RABc1yvFRuSkg1MJFKvuhIADpR86Sk - vk1W0Z5v0fSKpGUd8/OWzfGGYUmUKyVV0GCdL13GMMOSK9DpPSyvyt77eG5WmY3ZmctQ - TGC8Cmmzyp9qWwicYV847MUo/KmeyE8yz2h7Smb7WOcrkh2TV9S23hinrXd+nv5M0ZyF - ASEYU02I8rRxFXPCLp8D/KgP4shuTzi8Fg2/Hk1WrnV7b+j7LB2iDWk/cyp1qilFIKMU - ZBR7mheI1uaHirJEtlL1lGs5B+v25rI82daNM0pAfgJ1uilLnWPeFNCSgjxJjo/1l4rp - Y9qg== -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=TzGHd63YhhSYgCiRZ9tl0C+QqBhc3B9t1YurdXMHHEk=; - b=i14dfaCVcowVdtunic+1Wp2wGV+1ZNLuoXJwp7E15v+1eEJZwFN3kPpygTaLhCxUcK - GwKISgBQGzHrbHDnyg1HwrLXM02Ldx63K+ocW92bWoiabvGepNaNkKLLjh1Cc9Z5Udr5 - FaRfo4jqaLUlKwSETn1kU+GSCbHc7OjVJMEAosWc4bRRpy2Z+vcoUwHuCG5OaNg6EQsh - rYclOJRJfMAu448q1becWoBHIpImXDm50NiWfQtEoUOj5o22/QPRUwaUeIC5LrB/sOiI - ZDVFoRHgEjTok93ZXTlcDfOXok4PcETTA6aDez2v7cwSd2y9Z9PI3Ng1mnPK/vmvqmXW - iQZw== -X-Gm-Message-State: APjAAAXV8P3/lHsEKg8iHeiLr3dvIg5sDmZQ5/1qeeMO2VMTctGtUgtN - UfU23ad10Ce+u/Moful94ba6TP6V/uo= -X-Google-Smtp-Source: APXvYqzID3S043QvcjXSlnz2Lfed2XSsv1r0x047tSPe8/gvBVD1NyJxtMQ/ZV89X4qzhOAjTbC2WA== -X-Received: by 2002:a92:603:: with SMTP id x3mr17481056ilg.295.1570219742776; - Fri, 04 Oct 2019 13:09: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 i67sm4267112ilf.84.2019.10.04.13.09.02 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Fri, 04 Oct 2019 13:09:02 -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>, - Amitkumar Karwar <amitkarwar@gmail.com>, - Nishant Sarmukadam <nishants@marvell.com>, - Ganapathi Bhat <gbhat@marvell.com>, - Xinming Hu <huxinming820@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] mwifiex: pcie: Fix memory leak in mwifiex_pcie_alloc_cmdrsp_buf -Date: Fri, 4 Oct 2019 15:08:52 -0500 -Message-Id: <20191004200853.23353-1-navid.emamdoost@gmail.com> -X-Mailer: git-send-email 2.17.1 -To: unlisted-recipients:; (no To-header on input) -Sender: netdev-owner@vger.kernel.org -Precedence: bulk -List-ID: <netdev.vger.kernel.org> -X-Mailing-List: netdev@vger.kernel.org -Archived-At: <https://lore.kernel.org/netdev/20191004200853.23353-1-navid.emamdoost@gmail.com/> -List-Archive: <https://lore.kernel.org/netdev/> -List-Post: <mailto:netdev@vger.kernel.org> - -In mwifiex_pcie_alloc_cmdrsp_buf, a new skb is allocated which should be -released if mwifiex_map_pci_memory() fails. The release is added. - -Fixes: fc3314609047 ("mwifiex: use pci_alloc/free_consistent APIs for PCIe") -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> ---- - drivers/net/wireless/marvell/mwifiex/pcie.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c -index eff06d59e9df..1578eaa071bd 100644 ---- a/drivers/net/wireless/marvell/mwifiex/pcie.c -+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c -@@ -1029,8 +1029,10 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter) - } - skb_put(skb, MWIFIEX_UPLD_SIZE); - if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE, -- PCI_DMA_FROMDEVICE)) -+ PCI_DMA_FROMDEVICE)) { -+ kfree_skb(skb); - return -1; -+ } - - card->cmdrsp_buf = skb; - --- -2.17.1 - - diff --git a/rpmsg-char-release-allocated-memory.patch b/rpmsg-char-release-allocated-memory.patch deleted file mode 100644 index fa44f8468..000000000 --- a/rpmsg-char-release-allocated-memory.patch +++ /dev/null @@ -1,103 +0,0 @@ -From patchwork Tue Sep 17 03:31:23 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: 11148039 -Return-Path: <SRS0=dwWG=XM=vger.kernel.org=linux-remoteproc-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 AADA514E5 - for <patchwork-linux-remoteproc@patchwork.kernel.org>; - Tue, 17 Sep 2019 03:31:44 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 8922720650 - for <patchwork-linux-remoteproc@patchwork.kernel.org>; - Tue, 17 Sep 2019 03:31:44 +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="rGHRRJc6" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S2392211AbfIQDbo (ORCPT - <rfc822;patchwork-linux-remoteproc@patchwork.kernel.org>); - Mon, 16 Sep 2019 23:31:44 -0400 -Received: from mail-io1-f65.google.com ([209.85.166.65]:43574 "EHLO - mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1730000AbfIQDbo (ORCPT - <rfc822;linux-remoteproc@vger.kernel.org>); - Mon, 16 Sep 2019 23:31:44 -0400 -Received: by mail-io1-f65.google.com with SMTP id v2so4080968iob.10; - Mon, 16 Sep 2019 20:31:43 -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=AZbBTIbQbqXwZoo2mD7WVQh8P9va3DGLxdwCMpbqykM=; - b=rGHRRJc6cmlQU6fzDipZt7KO5qJAWDWcnNDKSmndXpk0ewSLW23M8z7MSAS//IRj1l - tALlRIDw+7SUzX5oZBm7estXiqj5CDURnMfZuF79BxBQ+zBn15C215GlFtTeHRuG5oJR - v35CbGdsHyQUlJbZwndh7jhpbviDigFIUwvtN87/RcR1LLkquGA24oKzOknAIZzGKLxO - 7oJx7GgYMDJcZTaQBiy1SXTwC0dRQjDNmtdSjt40yzfROfi7nvGYsEyGo683REJTh3cr - Csz+zl2qSybIJaFl1b9JqdfU0fZdWLhwBvZAW6VFTo1GDKCalj3bu56OLWpXe5/2EyHe - k8+Q== -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=AZbBTIbQbqXwZoo2mD7WVQh8P9va3DGLxdwCMpbqykM=; - b=H0T7GzjEzd76Q4M+fZ0zeWuyI2xvoQ6DwrCEEZr3Gb78xewtcJrJ2Uoy02HqXTY7Wh - wPXhKdlNpvGEAr5jCqHSqAO97xEf0q8Uo+5PTpbIePdn6AUBy+oZq95pT7ugT55Lw+X4 - 0q/Ef6854dvkM3Z9cjers0ia9MTaDYv1Ipn5SZ0gb87EvuZ9iQxfcNxpiqrAR3DfEGIH - LTwDRowj4YD0b9QqzpEyDlqbsMWY2241Yfj+awLnJ0gOSCTnAhE/BlgB2BrraWvCYfFH - t7thN0U6VI7faKxaP/Q1pUMeJ3tIcq+5lXfEzZecdIBxHFvS5W4u4eULnDUKhaa/jk4u - SLbQ== -X-Gm-Message-State: APjAAAVgR6KWN4oOwYJYA/Y6CJAcZxUfM16AUVfuG/Yx618weACP4BC4 - YV7/xT1rb1pLuAt/gojQxXgdV4jgRos= -X-Google-Smtp-Source: - APXvYqx4BGYBTXWug5NY3wJbo99uGA8r8HQaH6QnaLuCl7KSJytf2lAhCbNRWnl2/4bx5Sw7OH9Ksg== -X-Received: by 2002:a6b:c7c2:: with SMTP id - x185mr1469065iof.224.1568691103125; - Mon, 16 Sep 2019 20:31:43 -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 - i26sm1134258ion.40.2019.09.16.20.31.42 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Mon, 16 Sep 2019 20:31:42 -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>, - Ohad Ben-Cohen <ohad@wizery.com>, - Bjorn Andersson <bjorn.andersson@linaro.org>, - linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH] rpmsg: char: release allocated memory -Date: Mon, 16 Sep 2019 22:31:23 -0500 -Message-Id: <20190917033124.1077-1-navid.emamdoost@gmail.com> -X-Mailer: git-send-email 2.17.1 -To: unlisted-recipients:; (no To-header on input) -Sender: linux-remoteproc-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-remoteproc.vger.kernel.org> -X-Mailing-List: linux-remoteproc@vger.kernel.org - -In rpmsg_eptdev_write_iter, if copy_from_iter_full fails the allocated -buffer needs to be released. - -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> ---- - drivers/rpmsg/rpmsg_char.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c -index eea5ebbb5119..c655074c07c2 100644 ---- a/drivers/rpmsg/rpmsg_char.c -+++ b/drivers/rpmsg/rpmsg_char.c -@@ -227,8 +227,10 @@ static ssize_t rpmsg_eptdev_write_iter(struct kiocb *iocb, - if (!kbuf) - return -ENOMEM; - -- if (!copy_from_iter_full(kbuf, len, from)) -- return -EFAULT; -+ if (!copy_from_iter_full(kbuf, len, from)) { -+ ret = -EFAULT; -+ goto free_kbuf; -+ } - - if (mutex_lock_interruptible(&eptdev->ept_lock)) { - ret = -ERESTARTSYS; diff --git a/rtl8xxxu-prevent-leaking-urb.patch b/rtl8xxxu-prevent-leaking-urb.patch deleted file mode 100644 index ff088dea0..000000000 --- a/rtl8xxxu-prevent-leaking-urb.patch +++ /dev/null @@ -1,101 +0,0 @@ -From patchwork Fri Sep 20 03:00:41 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: 11153733 -X-Patchwork-Delegate: kvalo@adurom.com -Return-Path: <SRS0=+Ljc=XP=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 7607B76 - for <patchwork-linux-wireless@patchwork.kernel.org>; - Fri, 20 Sep 2019 03:00:56 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 48CF521929 - for <patchwork-linux-wireless@patchwork.kernel.org>; - Fri, 20 Sep 2019 03:00:56 +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="fzAGUdQV" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S2405830AbfITDAw (ORCPT - <rfc822;patchwork-linux-wireless@patchwork.kernel.org>); - Thu, 19 Sep 2019 23:00:52 -0400 -Received: from mail-io1-f66.google.com ([209.85.166.66]:44050 "EHLO - mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S2389956AbfITDAv (ORCPT - <rfc822;linux-wireless@vger.kernel.org>); - Thu, 19 Sep 2019 23:00:51 -0400 -Received: by mail-io1-f66.google.com with SMTP id j4so12740088iog.11; - Thu, 19 Sep 2019 20:00:51 -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=wR9pye3sH3f9c/Ue486PD/cpETKoqUyEfHnMaMiRPdY=; - b=fzAGUdQVIXP8BO6Um0bEY7aXmxWrofp3WYusEuhMgPmQ27A5ZhIq51xSMAN9gohJey - xdsD6nXME5ZveH9/lQ1MvNo7e8lxKB+VJiF53+KRWHjYY3yo3CO+r/lMh38wUGe5T120 - NI5FyQ8YmYV/aaqGUTa6/SbDVBDZBSb3F3uOkXNjWxRyI80HGsx60/fhQaY8HNtHHcDb - 511aV1DthYS9mGIh4z56qpebAKs9Q6CMcrqtYaemGR01y1sZsyooYZweWPqYYQ28lZUi - oVHgUKZHp3jvfYhzZnVc8ousIPPiZiLXszN06Siqs6CGkR6p4m+lf80we8Xi6J0bEISz - hFBw== -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=wR9pye3sH3f9c/Ue486PD/cpETKoqUyEfHnMaMiRPdY=; - b=mUe4i46sJphvT9eHFwqTegYlyqNnE95+R/GbAr/Is0OJfzCFXHu/cUrw5ElaQR4ATd - ShSEU7xpcL4ISPtNRc3kSBvt3ROv3RHbxdgCw3UYVG+DJLMet3AvPnJT0bwN5UWcCodd - z7bw4VprjwTZj8WPj+itlX2LdPws17O4C/ROM8RuRJ7MFQLwCg0qLscbxBXwKUsnyoTp - KIi52u4X85ABBEBFgGrx6ZS/sllG/u+spcSMjf/TVV0UglkLy7sRgZ4gyMBHgbMrzUDO - tGJQMGon7uU9OTA6a73s3ap8eeQ/c8KZUftJBh6c7xJL7qrH5lfZJSQBjePgKF+RF/rt - 40wQ== -X-Gm-Message-State: APjAAAWUFzu7MpjxWJtu4hgZuo8rk1uE8i27EiFcdjhNEG5ZaOg9jkNB - zqGym44mT1nF7nFS4RHjg/Y= -X-Google-Smtp-Source: - APXvYqwI+IXRu7Lhr0HmMj08qfXGIRkcCHYMdmSMkCW5GIIz+Ml1cQ5Uy6GCUGV2WrCpixMQAv4aog== -X-Received: by 2002:a02:ac82:: with SMTP id x2mr13978167jan.34.1568948450810; - Thu, 19 Sep 2019 20:00:50 -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 - t9sm380269iop.86.2019.09.19.20.00.50 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Thu, 19 Sep 2019 20:00:50 -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>, - Jes Sorensen <Jes.Sorensen@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] rtl8xxxu: prevent leaking urb -Date: Thu, 19 Sep 2019 22:00:41 -0500 -Message-Id: <20190920030043.30137-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 rtl8xxxu_submit_int_urb if usb_submit_urb fails the allocated urb -should be released. - -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> -Reviewed-by: Chris Chiu <chiu@endlessm.com> ---- - drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c -index 8136e268b4e6..4a559c37e208 100644 ---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c -+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c -@@ -5443,6 +5443,7 @@ static int rtl8xxxu_submit_int_urb(struct ieee80211_hw *hw) - ret = usb_submit_urb(urb, GFP_KERNEL); - if (ret) { - usb_unanchor_urb(urb); -+ usb_free_urb(urb); - goto error; - } - diff --git a/scsi-bfa-release-allocated-memory-in-case-of-error.patch b/scsi-bfa-release-allocated-memory-in-case-of-error.patch deleted file mode 100644 index 6bbf61364..000000000 --- a/scsi-bfa-release-allocated-memory-in-case-of-error.patch +++ /dev/null @@ -1,105 +0,0 @@ -From mboxrd@z Thu Jan 1 00:00:00 1970 -Return-Path: <SRS0=qYHy=XF=vger.kernel.org=linux-scsi-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.8 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 91A3BC49ED7 - for <linux-scsi@archiver.kernel.org>; Tue, 10 Sep 2019 23:44:32 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 695AB216F4 - for <linux-scsi@archiver.kernel.org>; Tue, 10 Sep 2019 23:44:32 +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="agIEQzR/" -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1726192AbfIJXo2 (ORCPT <rfc822;linux-scsi@archiver.kernel.org>); - Tue, 10 Sep 2019 19:44:28 -0400 -Received: from mail-io1-f68.google.com ([209.85.166.68]:47033 "EHLO - mail-io1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1725876AbfIJXo2 (ORCPT - <rfc822;linux-scsi@vger.kernel.org>); Tue, 10 Sep 2019 19:44:28 -0400 -Received: by mail-io1-f68.google.com with SMTP id d17so19749943ios.13; - Tue, 10 Sep 2019 16:44:28 -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=ZGP+PYUf116KpmFZWCQJ/+W1BpD8OneYbmbPw8KI1DY=; - b=agIEQzR/UIcZsX92ydKv9iYSTD0wKkF0DCdfCvbuRl+mJRlsmk4xv6oXdAgiahYN66 - Y4Q1c3uqGfdg1IWTY8T5VS2bzEO4YTifAiDII2S1ZWE4qCq8jQdhAiMYFsy8Ny7SDa1i - RXfYurzoCzrqs+1B+eQquaIosJ9qTs67bacbWDhEbp+bhuDtAJoSJ2fs0ADFREjunWBy - UiNXq4j/j6LSfUZc7/Al3xGpHnxht5yshuaAEMNrtlbZPVklWY2XcluBTm1eBpVv4pNu - 6n0+q3EwwYu6YMWPprH1JbHi2Uu9ZaR2Jluku1++jFb128U92+e23LofkhY5gkwB7hwY - Liug== -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=ZGP+PYUf116KpmFZWCQJ/+W1BpD8OneYbmbPw8KI1DY=; - b=Vn2eF6QjqBqKG9rCWyHMzAcWxAyjzqoNnmTtmP1drV/AtPZojXG21vO6Yrnrd0w3PE - D6Ej3hyD9banePwuxeoxD9PJaOZhH6vDSisM4T6cdycmHACIq7Q4y0wNLMJHmBpfx92C - WnE4PkQBXz9XrBkbHT0/qI0csFhmBgKD4B+pbnRSAiIqSIt4WSSTwSpLo/TOL7Ub4fTj - pzgVYex3XzJEdoPo2wADo0RBjCbf+JqPDME58Yub8LpfLVerY/I/+jo838cdS9dbfHcN - cD1eu4BYssjD887++aPPqQnIKLOMNl4pra1065KqKPtIfrEB1T9nwAqxbcC8/weZWeAn - MbFA== -X-Gm-Message-State: APjAAAVbAnon8+4rQ6lpU3M2lHtSY87bZtAXd06oMDim1otUrO2FXd8d - LBElDhZf0bU+XXNO4CU1XdQ= -X-Google-Smtp-Source: APXvYqzpHFPcs8wqSh6UDjLhtAgV9r92A+H6PKQaASa8MTnRPf9hCZWEZ/wN9o/vH1jWAEJYkcaPtA== -X-Received: by 2002:a6b:b714:: with SMTP id h20mr37211941iof.302.1568159067609; - Tue, 10 Sep 2019 16:44:27 -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 z20sm19383990iof.38.2019.09.10.16.44.26 - (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); - Tue, 10 Sep 2019 16:44:27 -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>, - Anil Gurumurthy <anil.gurumurthy@qlogic.com>, - Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>, - "James E.J. Bottomley" <jejb@linux.ibm.com>, - "Martin K. Petersen" <martin.petersen@oracle.com>, - linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH] scsi: bfa: release allocated memory in case of error -Date: Tue, 10 Sep 2019 18:44:15 -0500 -Message-Id: <20190910234417.22151-1-navid.emamdoost@gmail.com> -X-Mailer: git-send-email 2.17.1 -To: unlisted-recipients:; (no To-header on input) -Sender: linux-scsi-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-scsi.vger.kernel.org> -X-Mailing-List: linux-scsi@vger.kernel.org -Archived-At: <https://lore.kernel.org/linux-scsi/20190910234417.22151-1-navid.emamdoost@gmail.com/> -List-Archive: <https://lore.kernel.org/linux-scsi/> -List-Post: <mailto:linux-scsi@vger.kernel.org> - -In bfad_im_get_stats if bfa_port_get_stats fails, allocated memory -needs to be released. - -Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> ---- - drivers/scsi/bfa/bfad_attr.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c -index 29ab81df75c0..fbfce02e5b93 100644 ---- a/drivers/scsi/bfa/bfad_attr.c -+++ b/drivers/scsi/bfa/bfad_attr.c -@@ -275,8 +275,10 @@ bfad_im_get_stats(struct Scsi_Host *shost) - rc = bfa_port_get_stats(BFA_FCPORT(&bfad->bfa), - fcstats, bfad_hcb_comp, &fcomp); - spin_unlock_irqrestore(&bfad->bfad_lock, flags); -- if (rc != BFA_STATUS_OK) -+ if (rc != BFA_STATUS_OK) { -+ kfree(fcstats); - return NULL; -+ } - - wait_for_completion(&fcomp.comp); - --- -2.17.1 - - @@ -1,2 +1,2 @@ SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f -SHA512 (patch-5.4.11.xz) = c8da64a992edb27fc4c9faf79f35edacfdc9c00b72a684d00486fab7eecbd5179bc1826be1598751fa5b1f61ff819d8ccfcebc215b3fff98b75cb46156b7e164 +SHA512 (patch-5.4.12.xz) = a5f247f9d8acb855936278679469de199a49366d79ea63b2a987a2bebb4fe5b7eeb698181fe6d561fd3de3c0736e42fd499c881abd6cd5fee996506133e4d143 diff --git a/tpm-handle-negative-priv--response_len-in-tpm_common_read.patch b/tpm-handle-negative-priv--response_len-in-tpm_common_read.patch deleted file mode 100644 index 40df117ff..000000000 --- a/tpm-handle-negative-priv--response_len-in-tpm_common_read.patch +++ /dev/null @@ -1,89 +0,0 @@ -From patchwork Tue Jan 7 22:04:48 2020 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Tadeusz Struk <tadeusz.struk@intel.com> -X-Patchwork-Id: 1176682 -Return-Path: <SRS0=facv=24=vger.kernel.org=linux-kernel-owner@kernel.org> -Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) - by smtp.lore.kernel.org (Postfix) with ESMTP id 5846CC3F68F - for <linux-kernel@archiver.kernel.org>; Tue, 7 Jan 2020 22:04:42 +0000 (UTC) -Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) - by mail.kernel.org (Postfix) with ESMTP id 207982073D - for <linux-kernel@archiver.kernel.org>; Tue, 7 Jan 2020 22:04:42 +0000 (UTC) -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1727451AbgAGWEl (ORCPT - <rfc822;linux-kernel@archiver.kernel.org>); - Tue, 7 Jan 2020 17:04:41 -0500 -Received: from mga11.intel.com ([192.55.52.93]:40523 "EHLO mga11.intel.com" - rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP - id S1727080AbgAGWEk (ORCPT <rfc822;linux-kernel@vger.kernel.org>); - Tue, 7 Jan 2020 17:04:40 -0500 -X-Amp-Result: SKIPPED(no attachment in message) -X-Amp-File-Uploaded: False -Received: from fmsmga007.fm.intel.com ([10.253.24.52]) - by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; - 07 Jan 2020 14:04:40 -0800 -X-ExtLoop1: 1 -X-IronPort-AV: E=Sophos;i="5.69,407,1571727600"; - d="scan'208";a="217317989" -Received: from tstruk-mobl1.jf.intel.com (HELO [127.0.1.1]) ([10.7.196.67]) - by fmsmga007.fm.intel.com with ESMTP; 07 Jan 2020 14:04:39 -0800 -Subject: [PATCH] tpm: handle negative priv->response_len in tpm_common_read -From: Tadeusz Struk <tadeusz.struk@intel.com> -To: jarkko.sakkinen@linux.intel.com -Cc: keescook@chromium.org, tadeusz.struk@intel.com, - linux-kernel@vger.kernel.org, stable@vger.kernel.org, - linux-integrity@vger.kernel.org, labbott@redhat.com -Date: Tue, 07 Jan 2020 14:04:48 -0800 -Message-ID: <157843468820.24718.10808226634364669421.stgit@tstruk-mobl1> -In-Reply-To: <b85fa669-d3aa-f6c9-9631-988ae47e392c@redhat.com> -References: <b85fa669-d3aa-f6c9-9631-988ae47e392c@redhat.com> -User-Agent: StGit/0.17.1-dirty -MIME-Version: 1.0 -Sender: linux-kernel-owner@vger.kernel.org -Precedence: bulk -List-ID: <linux-kernel.vger.kernel.org> -X-Mailing-List: linux-kernel@vger.kernel.org - -The priv->responce_length can hold the size of an response or -an negative error code, and the tpm_common_read() needs to handle -both cases correctly. Changed the type of responce_length to -signed and accounted for negative value in tpm_common_read() - -Cc: stable@vger.kernel.org -Fixes: d23d12484307 ("tpm: fix invalid locking in NONBLOCKING mode") -Reported-by: Laura Abbott <labbott@redhat.com> -Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com> -Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> ---- - drivers/char/tpm/tpm-dev-common.c | 2 +- - drivers/char/tpm/tpm-dev.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/char/tpm/tpm-dev-common.c b/drivers/char/tpm/tpm-dev-common.c -index b23b0b999232..87f449340202 100644 ---- a/drivers/char/tpm/tpm-dev-common.c -+++ b/drivers/char/tpm/tpm-dev-common.c -@@ -130,7 +130,7 @@ ssize_t tpm_common_read(struct file *file, char __user *buf, - priv->response_read = true; - - ret_size = min_t(ssize_t, size, priv->response_length); -- if (!ret_size) { -+ if (ret_size <= 0) { - priv->response_length = 0; - goto out; - } -diff --git a/drivers/char/tpm/tpm-dev.h b/drivers/char/tpm/tpm-dev.h -index 1089fc0bb290..f3742bcc73e3 100644 ---- a/drivers/char/tpm/tpm-dev.h -+++ b/drivers/char/tpm/tpm-dev.h -@@ -14,7 +14,7 @@ struct file_priv { - struct work_struct timeout_work; - struct work_struct async_work; - wait_queue_head_t async_wait; -- size_t response_length; -+ ssize_t response_length; - bool response_read; - bool command_enqueued; - |