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

ksmbd: remove smb2_buf_length in smb2_hdr 



To move smb2_hdr to smbfs_common, This patch remove smb2_buf_length
variable in smb2_hdr. Also, declare smb2_get_msg function to get smb2
request/response from ->request/response_buf.

Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 561a1cf5

fs/ksmbd/auth.c

+2 −2
Original line number Diff line number Diff line
@@ -873,9 +873,9 @@ int ksmbd_gen_preauth_integrity_hash(struct ksmbd_conn *conn, char *buf, 
				     __u8 *pi_hash)

{

	int rc;

	struct smb2_hdr *rcv_hdr = (struct smb2_hdr *)buf;

	struct smb2_hdr *rcv_hdr = smb2_get_msg(buf);

	char *all_bytes_msg = (char *)&rcv_hdr->ProtocolId;

	int msg_size = be32_to_cpu(rcv_hdr->smb2_buf_length);

	int msg_size = get_rfc1002_len(buf);

	struct ksmbd_crypto_ctx *ctx = NULL;



	if (conn->preauth_info->Preauth_HashId !=

fs/ksmbd/connection.c

+4 −5
Original line number Diff line number Diff line
@@ -158,14 +158,13 @@ void ksmbd_conn_wait_idle(struct ksmbd_conn *conn) 
int ksmbd_conn_write(struct ksmbd_work *work)

{

	struct ksmbd_conn *conn = work->conn;

	struct smb_hdr *rsp_hdr = work->response_buf;

	size_t len = 0;

	int sent;

	struct kvec iov[3];

	int iov_idx = 0;



	ksmbd_conn_try_dequeue_request(work);

	if (!rsp_hdr) {

	if (!work->response_buf) {

		pr_err("NULL response header\n");

		return -EINVAL;

	}
@@ -177,7 +176,7 @@ int ksmbd_conn_write(struct ksmbd_work *work) 
	}



	if (work->aux_payload_sz) {

		iov[iov_idx] = (struct kvec) { rsp_hdr, work->resp_hdr_sz };

		iov[iov_idx] = (struct kvec) { work->response_buf, work->resp_hdr_sz };

		len += iov[iov_idx++].iov_len;

		iov[iov_idx] = (struct kvec) { work->aux_payload_buf, work->aux_payload_sz };

		len += iov[iov_idx++].iov_len;
@@ -185,8 +184,8 @@ int ksmbd_conn_write(struct ksmbd_work *work) 
		if (work->tr_buf)

			iov[iov_idx].iov_len = work->resp_hdr_sz;

		else

			iov[iov_idx].iov_len = get_rfc1002_len(rsp_hdr) + 4;

		iov[iov_idx].iov_base = rsp_hdr;

			iov[iov_idx].iov_len = get_rfc1002_len(work->response_buf) + 4;

		iov[iov_idx].iov_base = work->response_buf;

		len += iov[iov_idx++].iov_len;

	}

fs/ksmbd/ksmbd_work.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ struct ksmbd_work { 
 */

static inline void *ksmbd_resp_buf_next(struct ksmbd_work *work)

{

	return work->response_buf + work->next_smb2_rsp_hdr_off;

	return work->response_buf + work->next_smb2_rsp_hdr_off + 4;

}



/**
@@ -101,7 +101,7 @@ static inline void *ksmbd_resp_buf_next(struct ksmbd_work *work) 
 */

static inline void *ksmbd_req_buf_next(struct ksmbd_work *work)

{

	return work->request_buf + work->next_smb2_rcv_hdr_off;

	return work->request_buf + work->next_smb2_rcv_hdr_off + 4;

}



struct ksmbd_work *ksmbd_alloc_work_struct(void);

fs/ksmbd/oplock.c

+12 −12
Original line number Diff line number Diff line
@@ -629,10 +629,10 @@ static void __smb2_oplock_break_noti(struct work_struct *wk) 
		return;

	}



	rsp_hdr = work->response_buf;

	rsp_hdr = smb2_get_msg(work->response_buf);

	memset(rsp_hdr, 0, sizeof(struct smb2_hdr) + 2);

	rsp_hdr->smb2_buf_length =

		cpu_to_be32(smb2_hdr_size_no_buflen(conn->vals));

	*(__be32 *)work->response_buf =

		cpu_to_be32(conn->vals->header_size);

	rsp_hdr->ProtocolId = SMB2_PROTO_NUMBER;

	rsp_hdr->StructureSize = SMB2_HEADER_STRUCTURE_SIZE;

	rsp_hdr->CreditRequest = cpu_to_le16(0);
@@ -645,7 +645,7 @@ static void __smb2_oplock_break_noti(struct work_struct *wk) 
	rsp_hdr->SessionId = 0;

	memset(rsp_hdr->Signature, 0, 16);



	rsp = work->response_buf;

	rsp = smb2_get_msg(work->response_buf);



	rsp->StructureSize = cpu_to_le16(24);

	if (!br_info->open_trunc &&
@@ -659,7 +659,7 @@ static void __smb2_oplock_break_noti(struct work_struct *wk) 
	rsp->PersistentFid = cpu_to_le64(fp->persistent_id);

	rsp->VolatileFid = cpu_to_le64(fp->volatile_id);



	inc_rfc1001_len(rsp, 24);

	inc_rfc1001_len(work->response_buf, 24);



	ksmbd_debug(OPLOCK,

		    "sending oplock break v_id %llu p_id = %llu lock level = %d\n",
@@ -736,10 +736,10 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
		return;

	}



	rsp_hdr = work->response_buf;

	rsp_hdr = smb2_get_msg(work->response_buf);

	memset(rsp_hdr, 0, sizeof(struct smb2_hdr) + 2);

	rsp_hdr->smb2_buf_length =

		cpu_to_be32(smb2_hdr_size_no_buflen(conn->vals));

	*(__be32 *)work->response_buf =

		cpu_to_be32(conn->vals->header_size);

	rsp_hdr->ProtocolId = SMB2_PROTO_NUMBER;

	rsp_hdr->StructureSize = SMB2_HEADER_STRUCTURE_SIZE;

	rsp_hdr->CreditRequest = cpu_to_le16(0);
@@ -752,7 +752,7 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
	rsp_hdr->SessionId = 0;

	memset(rsp_hdr->Signature, 0, 16);



	rsp = work->response_buf;

	rsp = smb2_get_msg(work->response_buf);

	rsp->StructureSize = cpu_to_le16(44);

	rsp->Epoch = br_info->epoch;

	rsp->Flags = 0;
@@ -768,7 +768,7 @@ static void __smb2_lease_break_noti(struct work_struct *wk) 
	rsp->AccessMaskHint = 0;

	rsp->ShareMaskHint = 0;



	inc_rfc1001_len(rsp, 44);

	inc_rfc1001_len(work->response_buf, 44);



	ksmbd_conn_write(work);

	ksmbd_free_work_struct(work);
@@ -1398,7 +1398,7 @@ struct lease_ctx_info *parse_lease_state(void *open_req) 
	if (!lreq)

		return NULL;



	data_offset = (char *)req + 4 + le32_to_cpu(req->CreateContextsOffset);

	data_offset = (char *)req + le32_to_cpu(req->CreateContextsOffset);

	cc = (struct create_context *)data_offset;

	do {

		cc = (struct create_context *)((char *)cc + next);
@@ -1462,7 +1462,7 @@ struct create_context *smb2_find_context_vals(void *open_req, const char *tag) 
	 * CreateContextsOffset and CreateContextsLength are guaranteed to

	 * be valid because of ksmbd_smb2_check_message().

	 */

	cc = (struct create_context *)((char *)req + 4 +

	cc = (struct create_context *)((char *)req +

				       le32_to_cpu(req->CreateContextsOffset));

	remain_len = le32_to_cpu(req->CreateContextsLength);

	do {

fs/ksmbd/smb2misc.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ int ksmbd_smb2_check_message(struct ksmbd_work *work) 
	struct smb2_hdr *hdr = &pdu->hdr;

	int command;

	__u32 clc_len;  /* calculated length */

	__u32 len = get_rfc1002_len(pdu);

	__u32 len = get_rfc1002_len(work->request_buf);



	if (le32_to_cpu(hdr->NextCommand) > 0)

		len = le32_to_cpu(hdr->NextCommand);