Home Home > GIT Browse > SLE15-SP2-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-09-16 07:11:01 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-09-16 07:11:01 +0200
commitc14d61f1525109ee0354198d7da469f76f329a32 (patch)
tree8061054cc619eda44e7cef6b4bf33260310c55b1
parentc865638afbd493b5063718088959b7987343b87c (diff)
parenta6851405456d5a8e94b2c817e69cb64e209efa98 (diff)
Merge branch 'SLE15-SP2' into SLE15-SP2-AZURESLE15-SP2-AZURE
-rw-r--r--config/arm64/default6
-rw-r--r--config/ppc64le/default6
-rw-r--r--config/s390x/default6
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/default6
-rw-r--r--patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch40
-rw-r--r--patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch42
-rw-r--r--patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch75
-rw-r--r--patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch38
-rw-r--r--patches.suse/net-ibmvnic-free-reset-work-of-removed-device-from-q.patch55
-rw-r--r--rpm/config.sh2
-rw-r--r--series.conf7
12 files changed, 10 insertions, 275 deletions
diff --git a/config/arm64/default b/config/arm64/default
index 94be942aec..78f117eca7 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.3.0-rc7 Kernel Configuration
+# Linux/arm64 5.3.0 Kernel Configuration
#
#
@@ -1176,7 +1176,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_SLP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
@@ -9104,11 +9103,10 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_STACKDEPOT=y
CONFIG_SBITMAP=y
CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
# CONFIG_STRING_SELFTEST is not set
# end of Library routines
-CONFIG_OBJAGG=m
-
#
# Kernel hacking
#
diff --git a/config/ppc64le/default b/config/ppc64le/default
index 8800de3776..0191361f6d 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.3.0-rc7 Kernel Configuration
+# Linux/powerpc 5.3.0 Kernel Configuration
#
#
@@ -962,7 +962,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_SLP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
@@ -5923,11 +5922,10 @@ CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
CONFIG_STACKDEPOT=y
CONFIG_SBITMAP=y
CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
# CONFIG_STRING_SELFTEST is not set
# end of Library routines
-CONFIG_OBJAGG=m
-
#
# Kernel hacking
#
diff --git a/config/s390x/default b/config/s390x/default
index 901917f7a3..74e4d6b4ee 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.3.0-rc7 Kernel Configuration
+# Linux/s390 5.3.0 Kernel Configuration
#
#
@@ -884,7 +884,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_SLP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
@@ -3744,11 +3743,10 @@ CONFIG_SG_POOL=y
CONFIG_STACKDEPOT=y
CONFIG_SBITMAP=y
CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
# CONFIG_STRING_SELFTEST is not set
# end of Library routines
-CONFIG_OBJAGG=m
-
#
# Kernel hacking
#
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index e3f43afd9a..a56c3532e6 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 5.3.0-rc7 Kernel Configuration
+# Linux/s390 5.3.0 Kernel Configuration
#
#
diff --git a/config/x86_64/default b/config/x86_64/default
index 572f95bb48..4ff3af9a2a 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.3.0-rc7 Kernel Configuration
+# Linux/x86_64 5.3.0 Kernel Configuration
#
#
@@ -1182,7 +1182,6 @@ CONFIG_NF_CONNTRACK_PPTP=m
CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CONNTRACK_SLP=m
CONFIG_NF_CT_NETLINK=m
CONFIG_NF_CT_NETLINK_TIMEOUT=m
CONFIG_NF_CT_NETLINK_HELPER=m
@@ -8553,11 +8552,10 @@ CONFIG_ARCH_STACKWALK=y
CONFIG_STACKDEPOT=y
CONFIG_SBITMAP=y
CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
# CONFIG_STRING_SELFTEST is not set
# end of Library routines
-CONFIG_OBJAGG=m
-
#
# Kernel hacking
#
diff --git a/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch b/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch
deleted file mode 100644
index 48a2f2d829..0000000000
--- a/patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Hui Peng <benquike@gmail.com>
-Date: Mon, 19 Aug 2019 18:02:29 -0400
-Subject: Fix a double free bug in rsi_91x_deinit
-References: bnc#1147116 CVE-2019-15504
-Patch-mainline: Submitted, http://patchwork.ozlabs.org/patch/1149623/
-
-`dev` (struct rsi_91x_usbdev *) field of adapter
-(struct rsi_91x_usbdev *) is allocated and initialized in
-`rsi_init_usb_interface`. If any error is detected in information
-read from the device side, `rsi_init_usb_interface` will be
-freed. However, in the higher level error handling code in
-`rsi_probe`, if error is detected, `rsi_91x_deinit` is called
-again, in which `dev` will be freed again, resulting double free.
-
-This patch fixes the double free by removing the free operation on
-`dev` in `rsi_init_usb_interface`, because `rsi_91x_deinit` is also
-used in `rsi_disconnect`, in that code path, the `dev` field is not
- (and thus needs to be) freed.
-
-This bug was found in v4.19, but is also present in the latest version
-of kernel.
-
-Reported-by: Hui Peng <benquike@gmail.com>
-Reported-by: Mathias Payer <mathias.payer@nebelwelt.net>
-Signed-off-by: Hui Peng <benquike@gmail.com>
-Acked-by: Benjamin Poirier <bpoirier@suse.com>
----
- drivers/net/wireless/rsi/rsi_91x_usb.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/net/wireless/rsi/rsi_91x_usb.c
-+++ b/drivers/net/wireless/rsi/rsi_91x_usb.c
-@@ -645,7 +645,6 @@ fail_rx:
- kfree(rsi_dev->tx_buffer);
-
- fail_eps:
-- kfree(rsi_dev);
-
- return status;
- }
diff --git a/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch b/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
deleted file mode 100644
index 5a92364808..0000000000
--- a/patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2292984907bdca09396f25c90bc1d30478d34fd5 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Tue, 26 Mar 2019 22:37:42 +0100
-Subject: [PATCH] Revert "Bluetooth: btusb: driver to enable the usb-wakeup
- feature"
-
-Patch-mainline: no, testing
-References: boo#1130448
-
-This reverts commit a0085f2510e8976614ad8f766b209448b385492f.
-
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
----
- drivers/bluetooth/btusb.c | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 4761499db9ee..6d35cdb99c5e 100644
---- a/drivers/bluetooth/btusb.c
-+++ b/drivers/bluetooth/btusb.c
-@@ -1138,10 +1138,6 @@ static int btusb_open(struct hci_dev *hdev)
- }
-
- data->intf->needs_remote_wakeup = 1;
-- /* device specific wakeup source enabled and required for USB
-- * remote wakeup while host is suspended
-- */
-- device_wakeup_enable(&data->udev->dev);
-
- if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
- goto done;
-@@ -1205,7 +1201,6 @@ static int btusb_close(struct hci_dev *hdev)
- goto failed;
-
- data->intf->needs_remote_wakeup = 0;
-- device_wakeup_disable(&data->udev->dev);
- usb_autopm_put_interface(data->intf);
-
- failed:
---
-2.20.1
-
diff --git a/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch b/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch
deleted file mode 100644
index a8fa81cbf8..0000000000
--- a/patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Wen Huang <huangwenabc@gmail.com>
-Subject: [PATCH] mwifiex: Fix three heap overflow at parsing element in
- cfg80211_ap_settings
-Date: Wed, 28 Aug 2019 10:07:51 +0800
-Message-id: <20190828020751.13625-1-huangwenabc@gmail.com>
-Patch-mainline: Submitted, https://patchwork.kernel.org/patch/11117681/
-References: CVE-2019-14814,bsc#1146512,CVE-2019-14815,bsc#1146514,CVE-2019-14816,bsc#1146516
-
-mwifiex_update_vs_ie(),mwifiex_set_uap_rates() and
-mwifiex_set_wmm_params() call memcpy() without checking
-the destination size.Since the source is given from
-user-space, this may trigger a heap buffer overflow.
-
-Fix them by putting the length check before performing memcpy().
-
-This fix addresses CVE-2019-14814,CVE-2019-14815,CVE-2019-14816.
-
-Signed-off-by: Wen Huang <huangwenabc@gmail.com>
-Acked-by: Ganapathi Bhat <gbhat@marvell.comg>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- drivers/net/wireless/marvell/mwifiex/ie.c | 3 +++
- drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 9 ++++++++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/marvell/mwifiex/ie.c b/drivers/net/wireless/marvell/mwifiex/ie.c
-index 653d347a9..580387f9f 100644
---- a/drivers/net/wireless/marvell/mwifiex/ie.c
-+++ b/drivers/net/wireless/marvell/mwifiex/ie.c
-@@ -241,6 +241,9 @@ static int mwifiex_update_vs_ie(const u8 *ies, int ies_len,
- }
-
- vs_ie = (struct ieee_types_header *)vendor_ie;
-+ if (le16_to_cpu(ie->ie_length) + vs_ie->len + 2 >
-+ IEEE_MAX_IE_SIZE)
-+ return -EINVAL;
- memcpy(ie->ie_buffer + le16_to_cpu(ie->ie_length),
- vs_ie, vs_ie->len + 2);
- le16_unaligned_add_cpu(&ie->ie_length, vs_ie->len + 2);
-diff --git a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
-index 18f7d9bf3..0939a8c8f 100644
---- a/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
-+++ b/drivers/net/wireless/marvell/mwifiex/uap_cmd.c
-@@ -265,6 +265,8 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg,
-
- rate_ie = (void *)cfg80211_find_ie(WLAN_EID_SUPP_RATES, var_pos, len);
- if (rate_ie) {
-+ if (rate_ie->len > MWIFIEX_SUPPORTED_RATES)
-+ return;
- memcpy(bss_cfg->rates, rate_ie + 1, rate_ie->len);
- rate_len = rate_ie->len;
- }
-@@ -272,8 +274,11 @@ mwifiex_set_uap_rates(struct mwifiex_uap_bss_param *bss_cfg,
- rate_ie = (void *)cfg80211_find_ie(WLAN_EID_EXT_SUPP_RATES,
- params->beacon.tail,
- params->beacon.tail_len);
-- if (rate_ie)
-+ if (rate_ie) {
-+ if (rate_ie->len > MWIFIEX_SUPPORTED_RATES - rate_len)
-+ return;
- memcpy(bss_cfg->rates + rate_len, rate_ie + 1, rate_ie->len);
-+ }
-
- return;
- }
-@@ -391,6 +396,8 @@ mwifiex_set_wmm_params(struct mwifiex_private *priv,
- params->beacon.tail_len);
- if (vendor_ie) {
- wmm_ie = vendor_ie;
-+ if (*(wmm_ie + 1) > sizeof(struct mwifiex_types_wmm_info))
-+ return;
- memcpy(&bss_cfg->wmm_info, wmm_ie +
- sizeof(struct ieee_types_header), *(wmm_ie + 1));
- priv->wmm_enabled = 1;
diff --git a/patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch b/patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch
deleted file mode 100644
index 95f3d19f72..0000000000
--- a/patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c8dc55956b09b53ccffceb6e3146981210e27821 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <msuchanek@suse.de>
-Date: Mon, 9 Sep 2019 22:44:51 +0200
-Subject: [PATCH] net/ibmvnic: Fix missing { in __ibmvnic_reset
-
-References: bsc#1149652 ltc#179635
-Patch-mainline: queued
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
-Git-commit: c8dc55956b09b53ccffceb6e3146981210e27821
-
-Commit 1c2977c09499 ("net/ibmvnic: free reset work of removed device from queue")
-adds a } without corresponding { causing build break.
-
-Fixes: 1c2977c09499 ("net/ibmvnic: free reset work of removed device from queue")
-Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-Reviewed-by: Tyrel Datwyler <tyreld@linux.ibm.com>
-Reviewed-by: Juliet Kim <julietk@linux.vnet.ibm.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
-index 6644cabc8e75..5cb55ea671e3 100644
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -1984,7 +1984,7 @@ static void __ibmvnic_reset(struct work_struct *work)
- rwi = get_next_rwi(adapter);
- while (rwi) {
- if (adapter->state == VNIC_REMOVING ||
-- adapter->state == VNIC_REMOVED)
-+ adapter->state == VNIC_REMOVED) {
- kfree(rwi);
- rc = EBUSY;
- break;
---
-2.22.0
-
diff --git a/patches.suse/net-ibmvnic-free-reset-work-of-removed-device-from-q.patch b/patches.suse/net-ibmvnic-free-reset-work-of-removed-device-from-q.patch
deleted file mode 100644
index 884e2d48a4..0000000000
--- a/patches.suse/net-ibmvnic-free-reset-work-of-removed-device-from-q.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1c2977c094998de032fee6e898c88b4a05483d08 Mon Sep 17 00:00:00 2001
-From: Juliet Kim <julietk@linux.vnet.ibm.com>
-Date: Thu, 5 Sep 2019 17:30:01 -0400
-Subject: [PATCH] net/ibmvnic: free reset work of removed device from queue
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-References: bsc#1149652 ltc#179635
-Patch-mainline: queued
-Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
-Git-commit: 1c2977c094998de032fee6e898c88b4a05483d08
-
-Commit 36f1031c51a2 ("ibmvnic: Do not process reset during or after
- device removal") made the change to exit reset if the driver has been
-removed, but does not free reset work items of the adapter from queue.
-
-Ensure all reset work items are freed when breaking out of the loop early.
-
-Fixes: 36f1031c51a2 ("ibmnvic: Do not process reset during or after device removal”)
-Signed-off-by: Juliet Kim <julietk@linux.vnet.ibm.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Acked-by: Michal Suchanek <msuchanek@suse.de>
----
- drivers/net/ethernet/ibm/ibmvnic.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
-index fa4bb940665c..6644cabc8e75 100644
---- a/drivers/net/ethernet/ibm/ibmvnic.c
-+++ b/drivers/net/ethernet/ibm/ibmvnic.c
-@@ -1985,7 +1985,10 @@ static void __ibmvnic_reset(struct work_struct *work)
- while (rwi) {
- if (adapter->state == VNIC_REMOVING ||
- adapter->state == VNIC_REMOVED)
-- goto out;
-+ kfree(rwi);
-+ rc = EBUSY;
-+ break;
-+ }
-
- if (adapter->force_reset_recovery) {
- adapter->force_reset_recovery = false;
-@@ -2011,7 +2014,7 @@ static void __ibmvnic_reset(struct work_struct *work)
- netdev_dbg(adapter->netdev, "Reset failed\n");
- free_all_rwi(adapter);
- }
--out:
-+
- adapter->resetting = false;
- if (we_lock_rtnl)
- rtnl_unlock();
---
-2.22.0
-
diff --git a/rpm/config.sh b/rpm/config.sh
index 7a6176266b..4eabd31f09 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
# The version of the main tarball to use
-SRCVERSION=5.3-rc8
+SRCVERSION=5.3
# variant of the kernel-source package, either empty or "-rt"
VARIANT=-azure
# enable kernel module compression
diff --git a/series.conf b/series.conf
index 611c6c1c72..68ac5588e7 100644
--- a/series.conf
+++ b/series.conf
@@ -48,10 +48,6 @@
# sorted patches
########################################################
- # davem/net
- patches.suse/net-ibmvnic-free-reset-work-of-removed-device-from-q.patch
- patches.suse/net-ibmvnic-Fix-missing-in-__ibmvnic_reset.patch
-
# jejb/scsi for-next
patches.suse/scsi-cxlflash-Mark-expected-switch-fall-throughs.patch
@@ -296,13 +292,10 @@
patches.suse/b43-missing-firmware-info.patch
patches.suse/net-ath10k-Fix-a-NULL-ptr-deref-bug.patch
patches.suse/net-ath6kl-Fix-a-NULL-ptr-deref-bug.patch
- patches.suse/Fix-a-double-free-bug-in-rsi_91x_deinit.patch
- patches.suse/mwifiex-Fix-three-heap-overflow-at-parsing-element.patch
########################################################
# USB
########################################################
- patches.suse/Revert-Bluetooth-btusb-driver-to-enable-the-usb-wake.patch
########################################################
# Input