Skip to content

Commit e88b27c

Browse files
Gilad Ben-Yossefherbertx
authored andcommitted
crypto: ccree - use std api sg_zero_buffer
Replace internal cc_zero_sgl() with kernel API of the same function sg_zero_buffer(). Signed-off-by: Gilad Ben-Yossef <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 7a4be6c commit e88b27c

File tree

3 files changed

+2
-24
lines changed

3 files changed

+2
-24
lines changed

drivers/crypto/ccree/cc_aead.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ static void cc_aead_complete(struct device *dev, void *cc_req, int err)
236236
/* In case of payload authentication failure, MUST NOT
237237
* revealed the decrypted message --> zero its memory.
238238
*/
239-
cc_zero_sgl(areq->dst, areq->cryptlen);
239+
sg_zero_buffer(areq->dst, sg_nents(areq->dst),
240+
areq->cryptlen, 0);
240241
err = -EBADMSG;
241242
}
242243
/*ENCRYPT*/

drivers/crypto/ccree/cc_buffer_mgr.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -99,27 +99,6 @@ static unsigned int cc_get_sgl_nents(struct device *dev,
9999
return nents;
100100
}
101101

102-
/**
103-
* cc_zero_sgl() - Zero scatter scatter list data.
104-
*
105-
* @sgl:
106-
*/
107-
void cc_zero_sgl(struct scatterlist *sgl, u32 data_len)
108-
{
109-
struct scatterlist *current_sg = sgl;
110-
int sg_index = 0;
111-
112-
while (sg_index <= data_len) {
113-
if (!current_sg) {
114-
/* reached the end of the sgl --> just return back */
115-
return;
116-
}
117-
memset(sg_virt(current_sg), 0, current_sg->length);
118-
sg_index += current_sg->length;
119-
current_sg = sg_next(current_sg);
120-
}
121-
}
122-
123102
/**
124103
* cc_copy_sg_portion() - Copy scatter list data,
125104
* from to_skip to end, to dest and vice versa

drivers/crypto/ccree/cc_buffer_mgr.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,4 @@ void cc_unmap_hash_request(struct device *dev, void *ctx,
6666
void cc_copy_sg_portion(struct device *dev, u8 *dest, struct scatterlist *sg,
6767
u32 to_skip, u32 end, enum cc_sg_cpy_direct direct);
6868

69-
void cc_zero_sgl(struct scatterlist *sgl, u32 data_len);
70-
7169
#endif /*__BUFFER_MGR_H__*/

0 commit comments

Comments
 (0)