crypto: chcr - Avoid changing request structure (d600fc8a) · Commits · e / devices / android_kernel_teracube_emerald

drivers/crypto/chelsio/chcr_algo.c

+14 −23

Original line number	Original line	Diff line number	Diff line
	@@ -126,13 +126,13 @@ static void chcr_verify_tag(struct aead_request req, u8 input, int *err)
	fw6_pld = (struct cpl_fw6_pld *)input;		fw6_pld = (struct cpl_fw6_pld *)input;
	if ((get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106) \|\|		if ((get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106) \|\|
	(get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_GCM)) {		(get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_GCM)) {
	cmp = memcmp(&fw6_pld->data[2], (fw6_pld + 1), authsize);		cmp = crypto_memneq(&fw6_pld->data[2], (fw6_pld + 1), authsize);
	} else {		} else {

	sg_pcopy_to_buffer(req->src, sg_nents(req->src), temp,		sg_pcopy_to_buffer(req->src, sg_nents(req->src), temp,
	authsize, req->assoclen +		authsize, req->assoclen +
	req->cryptlen - authsize);		req->cryptlen - authsize);
	cmp = memcmp(temp, (fw6_pld + 1), authsize);		cmp = crypto_memneq(temp, (fw6_pld + 1), authsize);
	}		}
	if (cmp)		if (cmp)
	*err = -EBADMSG;		*err = -EBADMSG;
	@@ -1840,9 +1840,8 @@ static struct sk_buff create_gcm_wr(struct aead_request req,
	struct scatterlist *src;		struct scatterlist *src;
	unsigned int frags = 0, transhdr_len;		unsigned int frags = 0, transhdr_len;
	unsigned int ivsize = AES_BLOCK_SIZE;		unsigned int ivsize = AES_BLOCK_SIZE;
	unsigned int dst_size = 0, kctx_len;		unsigned int dst_size = 0, kctx_len, assoclen = req->assoclen;
	unsigned char tag_offset = 0;		unsigned char tag_offset = 0;
	unsigned int crypt_len = 0;
	unsigned int authsize = crypto_aead_authsize(tfm);		unsigned int authsize = crypto_aead_authsize(tfm);
	int error = -EINVAL, src_nent;		int error = -EINVAL, src_nent;
	gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :		gfp_t flags = req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL :
	@@ -1854,27 +1853,21 @@ static struct sk_buff create_gcm_wr(struct aead_request req,

	if (op_type && req->cryptlen < crypto_aead_authsize(tfm))		if (op_type && req->cryptlen < crypto_aead_authsize(tfm))
	goto err;		goto err;
	src_nent = sg_nents_for_len(req->src, req->assoclen + req->cryptlen);		src_nent = sg_nents_for_len(req->src, assoclen + req->cryptlen);
	if (src_nent < 0)		if (src_nent < 0)
	goto err;		goto err;

	src = scatterwalk_ffwd(reqctx->srcffwd, req->src, req->assoclen);		src = scatterwalk_ffwd(reqctx->srcffwd, req->src, assoclen);
	reqctx->dst = src;		reqctx->dst = src;
	if (req->src != req->dst) {		if (req->src != req->dst) {
	error = chcr_copy_assoc(req, aeadctx);		error = chcr_copy_assoc(req, aeadctx);
	if (error)		if (error)
	return ERR_PTR(error);		return ERR_PTR(error);
	reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst,		reqctx->dst = scatterwalk_ffwd(reqctx->dstffwd, req->dst,
	req->assoclen);		assoclen);
	}		}

	if (!req->cryptlen)
	/* null-payload is not supported in the hardware.
	* software is sending block size
	*/
	crypt_len = AES_BLOCK_SIZE;
	else
	crypt_len = req->cryptlen;
	reqctx->dst_nents = sg_nents_for_len(reqctx->dst, req->cryptlen +		reqctx->dst_nents = sg_nents_for_len(reqctx->dst, req->cryptlen +
	(op_type ? -authsize : authsize));		(op_type ? -authsize : authsize));
	if (reqctx->dst_nents < 0) {		if (reqctx->dst_nents < 0) {
	@@ -1907,19 +1900,19 @@ static struct sk_buff create_gcm_wr(struct aead_request req,
	memset(chcr_req, 0, transhdr_len);		memset(chcr_req, 0, transhdr_len);

	if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106)		if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106)
	req->assoclen -= 8;		assoclen = req->assoclen - 8;

	tag_offset = (op_type == CHCR_ENCRYPT_OP) ? 0 : authsize;		tag_offset = (op_type == CHCR_ENCRYPT_OP) ? 0 : authsize;
	chcr_req->sec_cpl.op_ivinsrtofst = FILL_SEC_CPL_OP_IVINSR(		chcr_req->sec_cpl.op_ivinsrtofst = FILL_SEC_CPL_OP_IVINSR(
	ctx->dev->rx_channel_id, 2, (ivsize ?		ctx->dev->rx_channel_id, 2, (ivsize ?
	(req->assoclen + 1) : 0));		(assoclen + 1) : 0));
	chcr_req->sec_cpl.pldlen =		chcr_req->sec_cpl.pldlen =
	htonl(req->assoclen + ivsize + req->cryptlen);		htonl(assoclen + ivsize + req->cryptlen);
	chcr_req->sec_cpl.aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(		chcr_req->sec_cpl.aadstart_cipherstop_hi = FILL_SEC_CPL_CIPHERSTOP_HI(
	req->assoclen ? 1 : 0, req->assoclen,		assoclen ? 1 : 0, assoclen,
	req->assoclen + ivsize + 1, 0);		assoclen + ivsize + 1, 0);
	chcr_req->sec_cpl.cipherstop_lo_authinsert =		chcr_req->sec_cpl.cipherstop_lo_authinsert =
	FILL_SEC_CPL_AUTHINSERT(0, req->assoclen + ivsize + 1,		FILL_SEC_CPL_AUTHINSERT(0, assoclen + ivsize + 1,
	tag_offset, tag_offset);		tag_offset, tag_offset);
	chcr_req->sec_cpl.seqno_numivs =		chcr_req->sec_cpl.seqno_numivs =
	FILL_SEC_CPL_SCMD0_SEQNO(op_type, (op_type ==		FILL_SEC_CPL_SCMD0_SEQNO(op_type, (op_type ==
	@@ -1955,9 +1948,7 @@ static struct sk_buff create_gcm_wr(struct aead_request req,
	goto dstmap_fail;		goto dstmap_fail;

	skb_set_transport_header(skb, transhdr_len);		skb_set_transport_header(skb, transhdr_len);
			write_sg_to_skb(skb, &frags, req->src, assoclen);
	write_sg_to_skb(skb, &frags, req->src, req->assoclen);

	write_buffer_to_skb(skb, &frags, reqctx->iv, ivsize);		write_buffer_to_skb(skb, &frags, reqctx->iv, ivsize);
	write_sg_to_skb(skb, &frags, src, req->cryptlen);		write_sg_to_skb(skb, &frags, src, req->cryptlen);
	create_wreq(ctx, chcr_req, req, skb, kctx_len, size, 1,		create_wreq(ctx, chcr_req, req, skb, kctx_len, size, 1,