Commit eb547407 authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

ksmbd: downgrade RWH lease caching state to RH for directory 



RWH(Read + Write + Handle) caching state is not supported for directory.
ksmbd downgrade it to RH for directory if client send RWH caching lease
state.

Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 18dd1c36

fs/smb/server/oplock.c

+7 −2
Original line number Diff line number Diff line
@@ -1398,10 +1398,11 @@ void create_lease_buf(u8 *rbuf, struct lease *lease) 
/**

 * parse_lease_state() - parse lease context containted in file open request

 * @open_req:	buffer containing smb2 file open(create) request

 * @is_dir:	whether leasing file is directory

 *

 * Return:  oplock state, -ENOENT if create lease context not found

 */

struct lease_ctx_info *parse_lease_state(void *open_req)

struct lease_ctx_info *parse_lease_state(void *open_req, bool is_dir)

{

	struct create_context *cc;

	struct smb2_create_req *req = (struct smb2_create_req *)open_req;
@@ -1419,6 +1420,10 @@ struct lease_ctx_info *parse_lease_state(void *open_req) 
		struct create_lease_v2 *lc = (struct create_lease_v2 *)cc;



		memcpy(lreq->lease_key, lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE);

		if (is_dir)

			lreq->req_state = lc->lcontext.LeaseState &

				~SMB2_LEASE_WRITE_CACHING_LE;

		else

			lreq->req_state = lc->lcontext.LeaseState;

		lreq->flags = lc->lcontext.LeaseFlags;

		lreq->epoch = lc->lcontext.Epoch;

fs/smb/server/oplock.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ void opinfo_put(struct oplock_info *opinfo); 


/* Lease related functions */

void create_lease_buf(u8 *rbuf, struct lease *lease);

struct lease_ctx_info *parse_lease_state(void *open_req);

struct lease_ctx_info *parse_lease_state(void *open_req, bool is_dir);

__u8 smb2_map_lease_to_oplock(__le32 lease_state);

int lease_read_to_write(struct oplock_info *opinfo);

fs/smb/server/smb2pdu.c

+4 −4
Original line number Diff line number Diff line
@@ -2732,10 +2732,6 @@ int smb2_open(struct ksmbd_work *work) 
		}

	}



	req_op_level = req->RequestedOplockLevel;

	if (req_op_level == SMB2_OPLOCK_LEVEL_LEASE)

		lc = parse_lease_state(req);



	if (le32_to_cpu(req->ImpersonationLevel) > le32_to_cpu(IL_DELEGATE)) {

		pr_err("Invalid impersonationlevel : 0x%x\n",

		       le32_to_cpu(req->ImpersonationLevel));
@@ -3215,6 +3211,10 @@ int smb2_open(struct ksmbd_work *work) 
		need_truncate = 1;

	}



	req_op_level = req->RequestedOplockLevel;

	if (req_op_level == SMB2_OPLOCK_LEVEL_LEASE)

		lc = parse_lease_state(req, S_ISDIR(file_inode(filp)->i_mode));



	share_ret = ksmbd_smb_check_shared_mode(fp->filp, fp);

	if (!test_share_config_flag(work->tcon->share_conf, KSMBD_SHARE_FLAG_OPLOCKS) ||

	    (req_op_level == SMB2_OPLOCK_LEVEL_LEASE &&