Commit e1e3f530 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ceph-for-6.8-rc4' of https://github.com/ceph/ceph-client 

Pull ceph fixes from Ilya Dryomov:
 "Some fscrypt-related fixups (sparse reads are used only for encrypted
  files) and two cap handling fixes from Xiubo and Rishabh"

* tag 'ceph-for-6.8-rc4' of https://github.com/ceph/ceph-client:
  ceph: always check dir caps asynchronously
  ceph: prevent use-after-free in encode_cap_msg()
  ceph: always set initial i_blkbits to CEPH_FSCRYPT_BLOCK_SHIFT
  libceph: just wait for more data to be available on the socket
  libceph: rename read_sparse_msg_*() to read_partial_sparse_msg_*()
  libceph: fail sparse-read if the data length doesn't match
parents a2343df3 07045648

fs/ceph/caps.c

+2 −7
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap, 
	if (flushing & CEPH_CAP_XATTR_EXCL) {

		arg->old_xattr_buf = __ceph_build_xattrs_blob(ci);

		arg->xattr_version = ci->i_xattrs.version;

		arg->xattr_buf = ci->i_xattrs.blob;

		arg->xattr_buf = ceph_buffer_get(ci->i_xattrs.blob);

	} else {

		arg->xattr_buf = NULL;

		arg->old_xattr_buf = NULL;
@@ -1553,6 +1553,7 @@ static void __send_cap(struct cap_msg_args *arg, struct ceph_inode_info *ci) 
	encode_cap_msg(msg, arg);

	ceph_con_send(&arg->session->s_con, msg);

	ceph_buffer_put(arg->old_xattr_buf);

	ceph_buffer_put(arg->xattr_buf);

	if (arg->wake)

		wake_up_all(&ci->i_cap_wq);

}
@@ -3215,7 +3216,6 @@ static int ceph_try_drop_cap_snap(struct ceph_inode_info *ci, 


enum put_cap_refs_mode {

	PUT_CAP_REFS_SYNC = 0,

	PUT_CAP_REFS_NO_CHECK,

	PUT_CAP_REFS_ASYNC,

};
@@ -3331,11 +3331,6 @@ void ceph_put_cap_refs_async(struct ceph_inode_info *ci, int had) 
	__ceph_put_cap_refs(ci, had, PUT_CAP_REFS_ASYNC);

}



void ceph_put_cap_refs_no_check_caps(struct ceph_inode_info *ci, int had)

{

	__ceph_put_cap_refs(ci, had, PUT_CAP_REFS_NO_CHECK);

}



/*

 * Release @nr WRBUFFER refs on dirty pages for the given @snapc snap

 * context.  Adjust per-snap dirty page accounting as appropriate.

fs/ceph/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ struct inode *ceph_new_inode(struct inode *dir, struct dentry *dentry, 
	if (!inode)

		return ERR_PTR(-ENOMEM);



	inode->i_blkbits = CEPH_FSCRYPT_BLOCK_SHIFT;



	if (!S_ISLNK(*mode)) {

		err = ceph_pre_init_acls(dir, mode, as_ctx);

		if (err < 0)

fs/ceph/mds_client.c

+4 −5
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ void ceph_mdsc_release_request(struct kref *kref) 
	struct ceph_mds_request *req = container_of(kref,

						    struct ceph_mds_request,

						    r_kref);

	ceph_mdsc_release_dir_caps_no_check(req);

	ceph_mdsc_release_dir_caps_async(req);

	destroy_reply_info(&req->r_reply_info);

	if (req->r_request)

		ceph_msg_put(req->r_request);
@@ -4261,7 +4261,7 @@ void ceph_mdsc_release_dir_caps(struct ceph_mds_request *req) 
	}

}



void ceph_mdsc_release_dir_caps_no_check(struct ceph_mds_request *req)

void ceph_mdsc_release_dir_caps_async(struct ceph_mds_request *req)

{

	struct ceph_client *cl = req->r_mdsc->fsc->client;

	int dcaps;
@@ -4269,8 +4269,7 @@ void ceph_mdsc_release_dir_caps_no_check(struct ceph_mds_request *req) 
	dcaps = xchg(&req->r_dir_caps, 0);

	if (dcaps) {

		doutc(cl, "releasing r_dir_caps=%s\n", ceph_cap_string(dcaps));

		ceph_put_cap_refs_no_check_caps(ceph_inode(req->r_parent),

						dcaps);

		ceph_put_cap_refs_async(ceph_inode(req->r_parent), dcaps);

	}

}
@@ -4306,7 +4305,7 @@ static void replay_unsafe_requests(struct ceph_mds_client *mdsc, 
		if (req->r_session->s_mds != session->s_mds)

			continue;



		ceph_mdsc_release_dir_caps_no_check(req);

		ceph_mdsc_release_dir_caps_async(req);



		__send_request(session, req, true);

	}

fs/ceph/mds_client.h

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ extern int ceph_mdsc_do_request(struct ceph_mds_client *mdsc, 
				struct inode *dir,

				struct ceph_mds_request *req);

extern void ceph_mdsc_release_dir_caps(struct ceph_mds_request *req);

extern void ceph_mdsc_release_dir_caps_no_check(struct ceph_mds_request *req);

extern void ceph_mdsc_release_dir_caps_async(struct ceph_mds_request *req);

static inline void ceph_mdsc_get_request(struct ceph_mds_request *req)

{

	kref_get(&req->r_kref);

fs/ceph/super.h

+0 −2
Original line number Diff line number Diff line
@@ -1255,8 +1255,6 @@ extern void ceph_take_cap_refs(struct ceph_inode_info *ci, int caps, 
extern void ceph_get_cap_refs(struct ceph_inode_info *ci, int caps);

extern void ceph_put_cap_refs(struct ceph_inode_info *ci, int had);

extern void ceph_put_cap_refs_async(struct ceph_inode_info *ci, int had);

extern void ceph_put_cap_refs_no_check_caps(struct ceph_inode_info *ci,

					    int had);

extern void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,

				       struct ceph_snap_context *snapc);

extern void __ceph_remove_capsnap(struct inode *inode,