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

Commit 3b3ce01a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.8-rc2' of https://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "A patch for a NULL dereference bug introduced in 4.8-rc1 and a handful
  of static checker fixes"

* tag 'ceph-for-4.8-rc2' of https://github.com/ceph/ceph-client:
  ceph: initialize pathbase in the !dentry case in encode_caps_cb()
  rbd: nuke the 32-bit pool id check
  rbd: destroy header_oloc in rbd_dev_release()
  ceph: fix null pointer dereference in ceph_flush_snaps()
  libceph: using kfree_rcu() to simplify the code
  libceph: make cancel_generic_request() static
  libceph: fix return value check in alloc_msg_with_page_vector()
parents 85e97be3 4eacd4cb

drivers/block/rbd.c

+1 −9
Original line number Diff line number Diff line
@@ -3950,6 +3950,7 @@ static void rbd_dev_release(struct device *dev) 
	bool need_put = !!rbd_dev->opts;



	ceph_oid_destroy(&rbd_dev->header_oid);

	ceph_oloc_destroy(&rbd_dev->header_oloc);



	rbd_put_client(rbd_dev->rbd_client);

	rbd_spec_put(rbd_dev->spec);
@@ -5336,15 +5337,6 @@ static ssize_t do_rbd_add(struct bus_type *bus, 
	}

	spec->pool_id = (u64)rc;



	/* The ceph file layout needs to fit pool id in 32 bits */



	if (spec->pool_id > (u64)U32_MAX) {

		rbd_warn(NULL, "pool id too large (%llu > %u)",

				(unsigned long long)spec->pool_id, U32_MAX);

		rc = -EIO;

		goto err_out_client;

	}



	rbd_dev = rbd_dev_create(rbdc, spec, rbd_opts);

	if (!rbd_dev) {

		rc = -ENOMEM;

fs/ceph/caps.c

+4 −1
Original line number Diff line number Diff line
@@ -1347,9 +1347,12 @@ void ceph_flush_snaps(struct ceph_inode_info *ci, 
{

	struct inode *inode = &ci->vfs_inode;

	struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc;

	struct ceph_mds_session *session = *psession;

	struct ceph_mds_session *session = NULL;

	int mds;



	dout("ceph_flush_snaps %p\n", inode);

	if (psession)

		session = *psession;

retry:

	spin_lock(&ci->i_ceph_lock);

	if (!(ci->i_ceph_flags & CEPH_I_FLUSH_SNAPS)) {

fs/ceph/mds_client.c

+1 −0
Original line number Diff line number Diff line
@@ -2759,6 +2759,7 @@ static int encode_caps_cb(struct inode *inode, struct ceph_cap *cap, 
	} else {

		path = NULL;

		pathlen = 0;

		pathbase = 0;

	}



	spin_lock(&ci->i_ceph_lock);

net/ceph/mon_client.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static void complete_generic_request(struct ceph_mon_generic_request *req) 
	put_generic_request(req);

}



void cancel_generic_request(struct ceph_mon_generic_request *req)

static void cancel_generic_request(struct ceph_mon_generic_request *req)

{

	struct ceph_mon_client *monc = req->monc;

	struct ceph_mon_generic_request *lookup_req;

net/ceph/osd_client.c

+1 −1
Original line number Diff line number Diff line
@@ -4220,7 +4220,7 @@ static struct ceph_msg *alloc_msg_with_page_vector(struct ceph_msg_header *hdr) 


		pages = ceph_alloc_page_vector(calc_pages_for(0, data_len),

					       GFP_NOIO);

		if (!pages) {

		if (IS_ERR(pages)) {

			ceph_msg_put(m);

			return NULL;

		}