summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2019-12-13 12:24:35 -0500
committerLaura Abbott <labbott@redhat.com>2019-12-13 12:25:40 -0500
commitdfdeb7943196484267ffdcc3e270d81771e4a48d (patch)
tree0b7378ac2b5c95d9f2a9ed54ed74cb3afefe5635
parent8504c90006ebac3df8ad880aff81ae6748b8ed0a (diff)
downloadkernel-dfdeb7943196484267ffdcc3e270d81771e4a48d.tar.gz
kernel-dfdeb7943196484267ffdcc3e270d81771e4a48d.tar.xz
kernel-dfdeb7943196484267ffdcc3e270d81771e4a48d.zip
Linux v5.3.16
-rw-r--r--crypto-user-fix-memory-leak-in-crypto_reportstat.patch107
-rw-r--r--kernel.spec12
-rw-r--r--rsi-release-skb-if-rsi_prepare_beacon-fails.patch101
-rw-r--r--sources2
4 files changed, 5 insertions, 217 deletions
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 2f7cc0205..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(crypto_nlsk, skb, NETLINK_CB(in_skb).portid);
- }
---
-2.17.1
-
-
diff --git a/kernel.spec b/kernel.spec
index 8104c6dad..3ab3e1f09 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -56,7 +56,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 15
+%define stable_update 16
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -598,9 +598,6 @@ Patch507: 0001-ath9k_htc-release-allocated-buffer-if-timed-out.patch
# CVE-2019-19072 rhbz 1774946 1774947
Patch508: 0001-tracing-Have-error-path-in-predicate_parse-free-its-.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
@@ -616,10 +613,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
@@ -1918,6 +1911,9 @@ fi
#
#
%changelog
+* Fri Dec 13 2019 Laura Abbott <labbott@redhat.com> - 5.3.16-200
+- Linux v5.3.16
+
* Thu Dec 05 2019 Laura Abbott <labbott@redhat.com> - 5.3.15-200
- Linux v5.3.15
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 1d14d7de7..3e4340384 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
-SHA512 (patch-5.3.15.xz) = d9c258a5519552831956b53b68aa16e93b4b5a4edfdf7dfb315405e419b084ca31c53bd7e8b486d6f6ab5d70f8535ccf8881d30392b34fd7b3c19f2e31e785a6
+SHA512 (patch-5.3.16.xz) = f9f2047009b540a40dbea9048f030eba54bec162c8132e1347c0039fbbb0b381a31c01a2deae26014b5a72c13c3032ea20c598ae7262975e2df406046a2f2ba8