Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-17 17:16:31 +0200
committerAnthony Iliopoulos <ailiopoulos@suse.com>2019-05-17 17:16:31 +0200
commit678f7f4b690df015c4d9cb2cccec58afd5cd04be (patch)
tree67cd21fa19b2ed8e2b00a874b20273d632b65dcb
parent2ba49d2453b2e5603d74a2d664f09042f80a18da (diff)
xfs: check _btree_check_block value (bsc#1123663).
-rw-r--r--patches.fixes/xfs-check-_btree_check_block-value.patch49
-rw-r--r--series.conf1
2 files changed, 50 insertions, 0 deletions
diff --git a/patches.fixes/xfs-check-_btree_check_block-value.patch b/patches.fixes/xfs-check-_btree_check_block-value.patch
new file mode 100644
index 0000000000..a5d0edf4c8
--- /dev/null
+++ b/patches.fixes/xfs-check-_btree_check_block-value.patch
@@ -0,0 +1,49 @@
+From 1e86eabe73b73c82e1110c746ed3ec6d5e1c0a0d Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <darrick.wong@oracle.com>
+Date: Mon, 17 Jul 2017 14:30:45 -0700
+Subject: [PATCH] xfs: check _btree_check_block value
+Git-commit: 1e86eabe73b73c82e1110c746ed3ec6d5e1c0a0d
+Patch-mainline: v4.13-rc3
+References: bsc#1123663
+
+Check the _btree_check_block return value for the firstrec and lastrec
+functions, since we have the ability to signal that the repositioning
+did not succeed.
+
+Fixes-coverity-id: 114067
+Fixes-coverity-id: 114068
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Reviewed-by: Brian Foster <bfoster@redhat.com>
+Acked-by: Anthony Iliopoulos <ailiopoulos@suse.com>
+
+---
+ fs/xfs/libxfs/xfs_btree.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
+index 4da85fff69ad..e0bcc4a59efd 100644
+--- a/fs/xfs/libxfs/xfs_btree.c
++++ b/fs/xfs/libxfs/xfs_btree.c
+@@ -728,7 +728,8 @@ xfs_btree_firstrec(
+ * Get the block pointer for this level.
+ */
+ block = xfs_btree_get_block(cur, level, &bp);
+- xfs_btree_check_block(cur, block, level, bp);
++ if (xfs_btree_check_block(cur, block, level, bp))
++ return 0;
+ /*
+ * It's empty, there is no such record.
+ */
+@@ -757,7 +758,8 @@ xfs_btree_lastrec(
+ * Get the block pointer for this level.
+ */
+ block = xfs_btree_get_block(cur, level, &bp);
+- xfs_btree_check_block(cur, block, level, bp);
++ if (xfs_btree_check_block(cur, block, level, bp))
++ return 0;
+ /*
+ * It's empty, there is no such record.
+ */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 015f0c03f3..7503fd2261 100644
--- a/series.conf
+++ b/series.conf
@@ -4137,6 +4137,7 @@
patches.suse/KVM-nVMX-Fix-loss-of-L2-s-NMI-blocking-state.patch
patches.suse/KVM-s390-take-srcu-lock-when-getting-setting-storage.patch
patches.suse/KVM-LAPIC-Fix-reentrancy-issues-with-preempt-notifie.patch
+ patches.fixes/xfs-check-_btree_check_block-value.patch
patches.fixes/xfs-fix-quotacheck-dquot-id-overflow-infinite-loop.patch
patches.fixes/0001-NFS-Optimize-fallocate-by-refreshing-mapping-when-ne.patch
patches.fixes/perf-x86-intel-uncore-fix-skylake-upi-pmu-event-masks.patch