Home Home > GIT Browse > SLE12-SP5-UPDATE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-10-23 07:10:20 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-10-23 07:10:20 +0200
commit72e284fe97ba2eb1e58ec4cb84388dd3eee15ea2 (patch)
treeba11b897ccad3ad866918034bbbe20d54d5737e0
parent1e378829eaee4e0eb1c28d32ee78b76dd08ccf98 (diff)
parent862945bdc55dd7277ae5646d2deea30b9c5b2554 (diff)
Merge branch 'SLE12-SP5' into SLE12-SP5-UPDATESLE12-SP5-UPDATE
-rw-r--r--patches.suse/rtlwifi-Fix-potential-overflow-on-P2P-code.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.suse/rtlwifi-Fix-potential-overflow-on-P2P-code.patch b/patches.suse/rtlwifi-Fix-potential-overflow-on-P2P-code.patch
new file mode 100644
index 0000000000..a6ada55497
--- /dev/null
+++ b/patches.suse/rtlwifi-Fix-potential-overflow-on-P2P-code.patch
@@ -0,0 +1,38 @@
+From: Laura Abbott <labbott@redhat.com>
+Date: Fri, 18 Oct 2019 07:43:21 -0400
+Subject: [PATCH] rtlwifi: Fix potential overflow on P2P code
+Patch-mainline: Submitted, https://lkml.org/lkml/2019/10/18/557
+References: bsc#1154372 CVE-2019-17666
+
+Nicolas Waisman noticed that even though noa_len is checked for
+a compatible length it's still possible to overrun the buffers
+of p2pinfo since there's no check on the upper bound of noa_num.
+Bound noa_num against P2P_MAX_NOA_NUM.
+
+Reported-by: Nicolas Waisman <nico@semmle.com>
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+Acked-by: Cho, Yu-Chen <acho@suse.com>
+---
+ drivers/net/wireless/realtek/rtlwifi/ps.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtlwifi/ps.c
++++ b/drivers/net/wireless/realtek/rtlwifi/ps.c
+@@ -775,6 +775,8 @@ static void rtl_p2p_noa_ie(struct ieee80
+ return;
+ } else {
+ noa_num = (noa_len - 2) / 13;
++ if (noa_num > P2P_MAX_NOA_NUM)
++ noa_num = P2P_MAX_NOA_NUM;
+ }
+ noa_index = ie[3];
+ if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
+@@ -869,6 +871,8 @@ static void rtl_p2p_action_ie(struct iee
+ return;
+ } else {
+ noa_num = (noa_len - 2) / 13;
++ if (noa_num > P2P_MAX_NOA_NUM)
++ noa_num = P2P_MAX_NOA_NUM;
+ }
+ noa_index = ie[3];
+ if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode ==
diff --git a/series.conf b/series.conf
index 95461b476f..966e0dd3fd 100644
--- a/series.conf
+++ b/series.conf
@@ -50910,6 +50910,7 @@
patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch
patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch
patches.suse/cfg80211-wext-avoid-copying-malformed-SSIDs.patch
+ patches.suse/rtlwifi-Fix-potential-overflow-on-P2P-code.patch
########################################################
# ISDN