Commit 80941b2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-4.12-rc3' of git://github.com/ceph/ceph-client 

Pul ceph fixes from Ilya Dryomov:
 "A bunch of make W=1 and static checker fixups, a RECONNECT_SEQ
  messenger patch from Zheng and Luis' fallocate fix"

* tag 'ceph-for-4.12-rc3' of git://github.com/ceph/ceph-client:
  ceph: check that the new inode size is within limits in ceph_fallocate()
  libceph: cleanup old messages according to reconnect seq
  libceph: NULL deref on crush_decode() error path
  libceph: fix error handling in process_one_ticket()
  libceph: validate blob_struct_v in process_one_ticket()
  libceph: drop version variable from ceph_monmap_decode()
  libceph: make ceph_msg_data_advance() return void
  libceph: use kbasename() and kill ceph_file_part()
parents a38b461e 42c99fc4

fs/ceph/file.c

+5 −1
Original line number Diff line number Diff line
@@ -1671,8 +1671,12 @@ static long ceph_fallocate(struct file *file, int mode, 
	}



	size = i_size_read(inode);

	if (!(mode & FALLOC_FL_KEEP_SIZE))

	if (!(mode & FALLOC_FL_KEEP_SIZE)) {

		endoff = offset + length;

		ret = inode_newsize_ok(inode, endoff);

		if (ret)

			goto unlock;

	}



	if (fi->fmode & CEPH_FILE_MODE_LAZY)

		want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO;

include/linux/ceph/ceph_debug.h

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/string.h>



#ifdef CONFIG_CEPH_LIB_PRETTYDEBUG



/*
@@ -12,12 +14,10 @@ 
 */



# if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)

extern const char *ceph_file_part(const char *s, int len);

#  define dout(fmt, ...)						\

	pr_debug("%.*s %12.12s:%-4d : " fmt,				\

		 8 - (int)sizeof(KBUILD_MODNAME), "    ",		\

		 ceph_file_part(__FILE__, sizeof(__FILE__)),		\

		 __LINE__, ##__VA_ARGS__)

		 kbasename(__FILE__), __LINE__, ##__VA_ARGS__)

# else

/* faux printk call just to see any compiler warnings. */

#  define dout(fmt, ...)	do {				\

net/ceph/auth_x.c

+8 −5
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int process_one_ticket(struct ceph_auth_client *ac, 
	struct timespec validity;

	void *tp, *tpend;

	void **ptp;

	struct ceph_crypto_key new_session_key;

	struct ceph_crypto_key new_session_key = { 0 };

	struct ceph_buffer *new_ticket_blob;

	unsigned long new_expires, new_renew_after;

	u64 new_secret_id;
@@ -215,6 +215,9 @@ static int process_one_ticket(struct ceph_auth_client *ac, 
	dout(" ticket blob is %d bytes\n", dlen);

	ceph_decode_need(ptp, tpend, 1 + sizeof(u64), bad);

	blob_struct_v = ceph_decode_8(ptp);

	if (blob_struct_v != 1)

		goto bad;



	new_secret_id = ceph_decode_64(ptp);

	ret = ceph_decode_buffer(&new_ticket_blob, ptp, tpend);

	if (ret)
@@ -234,13 +237,13 @@ static int process_one_ticket(struct ceph_auth_client *ac, 
	     type, ceph_entity_type_name(type), th->secret_id,

	     (int)th->ticket_blob->vec.iov_len);

	xi->have_keys |= th->service;



out:

	return ret;

	return 0;



bad:

	ret = -EINVAL;

	goto out;

out:

	ceph_crypto_key_destroy(&new_session_key);

	return ret;

}



static int ceph_x_proc_ticket_reply(struct ceph_auth_client *ac,

net/ceph/ceph_common.c

+0 −13
Original line number Diff line number Diff line
@@ -56,19 +56,6 @@ static const struct kernel_param_ops param_ops_supported_features = { 
module_param_cb(supported_features, &param_ops_supported_features, NULL,

		S_IRUGO);



/*

 * find filename portion of a path (/foo/bar/baz -> baz)

 */

const char *ceph_file_part(const char *s, int len)

{

	const char *e = s + len;



	while (e != s && *(e-1) != '/')

		e--;

	return e;

}

EXPORT_SYMBOL(ceph_file_part);



const char *ceph_msg_type_name(int type)

{

	switch (type) {

net/ceph/messenger.c

+16 −10
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ static struct page *ceph_msg_data_next(struct ceph_msg_data_cursor *cursor, 
 * Returns true if the result moves the cursor on to the next piece

 * of the data item.

 */

static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,

static void ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor,

				  size_t bytes)

{

	bool new_piece;
@@ -1207,8 +1207,6 @@ static bool ceph_msg_data_advance(struct ceph_msg_data_cursor *cursor, 
		new_piece = true;

	}

	cursor->need_crc = new_piece;



	return new_piece;

}



static size_t sizeof_footer(struct ceph_connection *con)
@@ -1577,7 +1575,6 @@ static int write_partial_message_data(struct ceph_connection *con) 
		size_t page_offset;

		size_t length;

		bool last_piece;

		bool need_crc;

		int ret;



		page = ceph_msg_data_next(cursor, &page_offset, &length,
@@ -1592,7 +1589,7 @@ static int write_partial_message_data(struct ceph_connection *con) 
		}

		if (do_datacrc && cursor->need_crc)

			crc = ceph_crc32c_page(crc, page, page_offset, length);

		need_crc = ceph_msg_data_advance(cursor, (size_t)ret);

		ceph_msg_data_advance(cursor, (size_t)ret);

	}



	dout("%s %p msg %p done\n", __func__, con, msg);
@@ -2231,10 +2228,18 @@ static void process_ack(struct ceph_connection *con) 
	struct ceph_msg *m;

	u64 ack = le64_to_cpu(con->in_temp_ack);

	u64 seq;

	bool reconnect = (con->in_tag == CEPH_MSGR_TAG_SEQ);

	struct list_head *list = reconnect ? &con->out_queue : &con->out_sent;



	while (!list_empty(&con->out_sent)) {

		m = list_first_entry(&con->out_sent, struct ceph_msg,

				     list_head);

	/*

	 * In the reconnect case, con_fault() has requeued messages

	 * in out_sent. We should cleanup old messages according to

	 * the reconnect seq.

	 */

	while (!list_empty(list)) {

		m = list_first_entry(list, struct ceph_msg, list_head);

		if (reconnect && m->needs_out_seq)

			break;

		seq = le64_to_cpu(m->hdr.seq);

		if (seq > ack)

			break;
@@ -2243,6 +2248,7 @@ static void process_ack(struct ceph_connection *con) 
		m->ack_stamp = jiffies;

		ceph_msg_remove(m);

	}



	prepare_read_tag(con);

}
@@ -2299,7 +2305,7 @@ static int read_partial_msg_data(struct ceph_connection *con) 


		if (do_datacrc)

			crc = ceph_crc32c_page(crc, page, page_offset, ret);

		(void) ceph_msg_data_advance(cursor, (size_t)ret);

		ceph_msg_data_advance(cursor, (size_t)ret);

	}

	if (do_datacrc)

		con->in_data_crc = crc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE