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

Commit a5186b85 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Herbert Xu
Browse files

cifs: move to generic async completion 



cifs starts an async. crypto op and waits for their completion.
Move it over to generic code doing the same.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Acked-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 12f1ffc4

fs/cifs/smb2ops.c

+4 −26
Original line number Diff line number Diff line
@@ -2068,22 +2068,6 @@ init_sg(struct smb_rqst *rqst, u8 *sign) 
	return sg;

}



struct cifs_crypt_result {

	int err;

	struct completion completion;

};



static void cifs_crypt_complete(struct crypto_async_request *req, int err)

{

	struct cifs_crypt_result *res = req->data;



	if (err == -EINPROGRESS)

		return;



	res->err = err;

	complete(&res->completion);

}



static int

smb2_get_enc_key(struct TCP_Server_Info *server, __u64 ses_id, int enc, u8 *key)

{
@@ -2124,12 +2108,10 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc) 
	struct aead_request *req;

	char *iv;

	unsigned int iv_len;

	struct cifs_crypt_result result = {0, };

	DECLARE_CRYPTO_WAIT(wait);

	struct crypto_aead *tfm;

	unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize);



	init_completion(&result.completion);



	rc = smb2_get_enc_key(server, tr_hdr->SessionId, enc, key);

	if (rc) {

		cifs_dbg(VFS, "%s: Could not get %scryption key\n", __func__,
@@ -2189,14 +2171,10 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc) 
	aead_request_set_ad(req, assoc_data_len);



	aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,

				  cifs_crypt_complete, &result);

				  crypto_req_done, &wait);



	rc = enc ? crypto_aead_encrypt(req) : crypto_aead_decrypt(req);



	if (rc == -EINPROGRESS || rc == -EBUSY) {

		wait_for_completion(&result.completion);

		rc = result.err;

	}

	rc = crypto_wait_req(enc ? crypto_aead_encrypt(req)

				: crypto_aead_decrypt(req), &wait);



	if (!rc && enc)

		memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE);