Home Home > GIT Browse > SLE12-SP5-UPDATE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-10-14 14:54:28 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-10-14 14:54:28 +0200
commitf0fda8f7f98fc03abc1ec213a3f6678b1796cf14 (patch)
treeb7d98457861d274952c521176019db384bd18b61
parentf38ccbcfd3b7c5c23d0f9953127dadc656b6aaca (diff)
parentb43e1a30f126c8d696797d9c823bc5b5a9487b9b (diff)
Merge branch 'users/msuchanek/SLE15-SP1/for-next' into SLE15-SP1
Pull an IBM POWER fix from Michal Suchanek
-rw-r--r--patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm.patch (renamed from patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm_meta_-get-set.patch)21
-rw-r--r--series.conf4
2 files changed, 16 insertions, 9 deletions
diff --git a/patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm_meta_-get-set.patch b/patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm.patch
index 1d2c857471..940edd7c12 100644
--- a/patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm_meta_-get-set.patch
+++ b/patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm.patch
@@ -1,13 +1,13 @@
-From patchwork Fri Sep 27 06:20:02 2019
-X-Patchwork-Id: 1168278
-Date: Fri, 27 Sep 2019 11:50:02 +0530
-Message-Id: <20190927062002.3169-1-vaibhav@linux.ibm.com>
+From 612ee81b9461475b5a5612c2e8d71559dd3c7920 Mon Sep 17 00:00:00 2001
From: Vaibhav Jain <vaibhav@linux.ibm.com>
+Date: Fri, 27 Sep 2019 11:50:02 +0530
Subject: [PATCH] powerpc/papr_scm: Fix an off-by-one check in
papr_scm_meta_{get, set}
References: bsc#1152243 ltc#181472
-Patch-mainline: submitted https://patchwork.ozlabs.org/patch/1168278/
+Patch-mainline: queued
+Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git
+Git-commit: 612ee81b9461475b5a5612c2e8d71559dd3c7920
A validation check to prevent out of bounds read/write inside
functions papr_scm_meta_{get,set}() is off-by-one that prevent reads
@@ -28,16 +28,18 @@ access the entire config-area.
Fixes: 53e80bd042773('powerpc/nvdimm: Add support for multibyte read/write for metadata')
Signed-off-by: Vaibhav Jain <vaibhav@linux.ibm.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://lore.kernel.org/r/20190927062002.3169-1-vaibhav@linux.ibm.com
Acked-by: Michal Suchanek <msuchanek@suse.de>
---
arch/powerpc/platforms/pseries/papr_scm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c
-index a5ac371a3f06..0d0f4974a301 100644
+index 61883291defc..ee07d0718bf1 100644
--- a/arch/powerpc/platforms/pseries/papr_scm.c
+++ b/arch/powerpc/platforms/pseries/papr_scm.c
-@@ -124,7 +124,7 @@ static int papr_scm_meta_get(struct papr_scm_priv *p,
+@@ -152,7 +152,7 @@ static int papr_scm_meta_get(struct papr_scm_priv *p,
int len, read;
int64_t ret;
@@ -46,7 +48,7 @@ index a5ac371a3f06..0d0f4974a301 100644
return -EINVAL;
for (len = hdr->in_length; len; len -= read) {
-@@ -178,7 +178,7 @@ static int papr_scm_meta_set(struct papr_scm_priv *p,
+@@ -206,7 +206,7 @@ static int papr_scm_meta_set(struct papr_scm_priv *p,
__be64 data_be;
int64_t ret;
@@ -55,3 +57,6 @@ index a5ac371a3f06..0d0f4974a301 100644
return -EINVAL;
for (len = hdr->in_length; len; len -= wrote) {
+--
+2.23.0
+
diff --git a/series.conf b/series.conf
index 02d1b0be5a..a128142efb 100644
--- a/series.conf
+++ b/series.conf
@@ -50074,6 +50074,9 @@
patches.suse/scsi-qla2xxx-Remove-WARN_ON_ONCE-in-qla2x00_status_c.patch
patches.suse/scsi-qla2xxx-remove-redundant-assignment-to-pointer-.patch
+ # powerpc/linux next
+ patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm.patch
+
# dhowells/linux-fs keys-uefi
patches.suse/0001-KEYS-Allow-unrestricted-boot-time-addition-of-keys-t.patch
patches.suse/0002-efi-Add-EFI-signature-data-types.patch
@@ -50141,7 +50144,6 @@
patches.suse/0001-ACPICA-Increase-total-number-of-possible-Owner-IDs.patch
patches.suse/cifs-handle-netapp-error-codes.patch
patches.suse/0001-b2c2-flexcop-usb-add-sanity-checking.patch
- patches.suse/powerpc-papr_scm-Fix-an-off-by-one-check-in-papr_scm_meta_-get-set.patch
patches.suse/scsi-qla2xxx-fix-wait-condition-in-loop.patch
########################################################