Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Henriques <lhenriques@suse.com>2019-08-27 11:51:08 +0100
committerLuis Henriques <lhenriques@suse.com>2019-09-05 10:08:47 +0100
commit8543f4877d019ec90c1a185083dcbfc02a1a6264 (patch)
treecdd432f6e0223f8cf4e5c5fd180f0acf2a4fe3b8
parentb097a5c404ca86652faf048dbeebf729500f4b69 (diff)
libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer
(bsc#1148133).
-rw-r--r--patches.suse/libceph-allow-ceph_buffer_put-to-receive-a-null-ceph_buffer.patch29
-rw-r--r--series.conf1
2 files changed, 30 insertions, 0 deletions
diff --git a/patches.suse/libceph-allow-ceph_buffer_put-to-receive-a-null-ceph_buffer.patch b/patches.suse/libceph-allow-ceph_buffer_put-to-receive-a-null-ceph_buffer.patch
new file mode 100644
index 0000000000..e4cf896236
--- /dev/null
+++ b/patches.suse/libceph-allow-ceph_buffer_put-to-receive-a-null-ceph_buffer.patch
@@ -0,0 +1,29 @@
+From: Luis Henriques <lhenriques@suse.com>
+Date: Fri, 19 Jul 2019 15:32:19 +0100
+Subject: libceph: allow ceph_buffer_put() to receive a NULL ceph_buffer
+Git-commit: 5c498950f730aa17c5f8a2cdcb903524e4002ed2
+Patch-mainline: v5.3-rc6
+References: bsc#1148133
+
+Signed-off-by: Luis Henriques <lhenriques@suse.com>
+Reviewed-by: Jeff Layton <jlayton@kernel.org>
+Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
+---
+ include/linux/ceph/buffer.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/linux/ceph/buffer.h b/include/linux/ceph/buffer.h
+index 5e58bb29b1a3..11cdc7c60480 100644
+--- a/include/linux/ceph/buffer.h
++++ b/include/linux/ceph/buffer.h
+@@ -30,7 +30,8 @@ static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)
+
+ static inline void ceph_buffer_put(struct ceph_buffer *b)
+ {
+- kref_put(&b->kref, ceph_buffer_release);
++ if (b)
++ kref_put(&b->kref, ceph_buffer_release);
+ }
+
+ extern int ceph_decode_buffer(struct ceph_buffer **b, void **p, void *end);
+
diff --git a/series.conf b/series.conf
index 5f95cef9c3..a0a7d57b80 100644
--- a/series.conf
+++ b/series.conf
@@ -24126,6 +24126,7 @@
patches.suse/0001-HID-wacom-correct-misreported-EKR-ring-values.patch
patches.suse/drm-mediatek-use-correct-device-to-import-PRIME-buff.patch
patches.suse/drm-mediatek-mtk_drm_drv.c-Add-of_node_put-before-go.patch
+ patches.suse/libceph-allow-ceph_buffer_put-to-receive-a-null-ceph_buffer.patch
patches.suse/vfs-fix-page-locking-deadlocks-when-deduping-files.patch
patches.suse/fs-xfs-Fix-return-code-of-xfs_break_leased_layouts.patch
patches.suse/Revert-dm-bufio-fix-deadlock-with-loop-device.patch