[PATCH 4.7 52/69] libceph: add an ONSTACK initializer for oids
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2016-09-28 09:13:17
Also in:
lkml
4.7-stable review patch. If anyone has any objections, please let me know.
------------------
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;