Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca20892d authored by Henry C Chang's avatar Henry C Chang Committed by Sage Weil
Browse files

libceph: fix ceph_msg_new error path 



If memory allocation failed, calling ceph_msg_put() will cause GPF
since some of ceph_msg variables are not initialized first.

Fix Bug #970.

Signed-off-by: default avatarHenry C Chang <henry_c_chang@tcloudcomputing.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 3772d26d

net/ceph/messenger.c

+13 −13
Original line number Diff line number Diff line
@@ -2267,6 +2267,19 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags) 
	m->more_to_follow = false;

	m->pool = NULL;



	/* middle */

	m->middle = NULL;



	/* data */

	m->nr_pages = 0;

	m->page_alignment = 0;

	m->pages = NULL;

	m->pagelist = NULL;

	m->bio = NULL;

	m->bio_iter = NULL;

	m->bio_seg = 0;

	m->trail = NULL;



	/* front */

	if (front_len) {

		if (front_len > PAGE_CACHE_SIZE) {
@@ -2286,19 +2299,6 @@ struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags) 
	}

	m->front.iov_len = front_len;



	/* middle */

	m->middle = NULL;



	/* data */

	m->nr_pages = 0;

	m->page_alignment = 0;

	m->pages = NULL;

	m->pagelist = NULL;

	m->bio = NULL;

	m->bio_iter = NULL;

	m->bio_seg = 0;

	m->trail = NULL;



	dout("ceph_msg_new %p front %d\n", m, front_len);

	return m;