* Patch "libceph: add an ONSTACK initializer for oids" has been added to the 4.7-stable tree
@ 2016-09-28 8:38 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-09-28 8:38 UTC (permalink / raw)
To: idryomov, gregkh; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
libceph: add an ONSTACK initializer for oids
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libceph-add-an-onstack-initializer-for-oids.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 281dbe5db81c6137def9757e07a7aea14b1ed86e Mon Sep 17 00:00:00 2001
From: Ilya Dryomov <idryomov@gmail.com>
Date: Tue, 26 Jul 2016 15:22:35 +0200
Subject: libceph: add an ONSTACK initializer for oids
From: Ilya Dryomov <idryomov@gmail.com>
commit 281dbe5db81c6137def9757e07a7aea14b1ed86e upstream.
An on-stack oid in ceph_ioctl_get_dataloc() is not initialized,
resulting in a WARN and a NULL pointer dereference later on. We will
have more of these on-stack in the future, so fix it with a convenience
macro.
Fixes: d30291b985d1 ("libceph: variable-sized ceph_object_id")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/ceph/ioctl.c | 2 +-
include/linux/ceph/osdmap.h | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -183,7 +183,7 @@ static long ceph_ioctl_get_dataloc(struc
struct ceph_osd_client *osdc =
&ceph_sb_to_client(inode->i_sb)->client->osdc;
struct ceph_object_locator oloc;
- struct ceph_object_id oid;
+ CEPH_DEFINE_OID_ONSTACK(oid);
u64 len = 1, olen;
u64 tmp;
struct ceph_pg pgid;
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -115,6 +115,11 @@ static inline void ceph_oid_init(struct
oid->name_len = 0;
}
+#define CEPH_OID_INIT_ONSTACK(oid) \
+ ({ ceph_oid_init(&oid); oid; })
+#define CEPH_DEFINE_OID_ONSTACK(oid) \
+ struct ceph_object_id oid = CEPH_OID_INIT_ONSTACK(oid)
+
static inline bool ceph_oid_empty(const struct ceph_object_id *oid)
{
return oid->name == oid->inline_name && !oid->name_len;
Patches currently in stable-queue which might be from idryomov@gmail.com are
queue-4.7/ceph-fix-symbol-versioning-for-ceph_monc_do_statfs.patch
queue-4.7/libceph-fix-return-value-check-in-alloc_msg_with_page_vector.patch
queue-4.7/libceph-add-an-onstack-initializer-for-oids.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-28 8:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-28 8:38 Patch "libceph: add an ONSTACK initializer for oids" has been added to the 4.7-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.