@@ -4223,7 +4223,7 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len,
42234223static  void  * smb2_aead_req_alloc (struct  crypto_aead  * tfm , const  struct  smb_rqst  * rqst ,
42244224				 int  num_rqst , const  u8  * sig , u8  * * iv ,
42254225				 struct  aead_request  * * req , struct  sg_table  * sgt ,
4226- 				 unsigned int   * num_sgs ,  size_t   * sensitive_size )
4226+ 				 unsigned int   * num_sgs )
42274227{
42284228	unsigned int   req_size  =  sizeof (* * req ) +  crypto_aead_reqsize (tfm );
42294229	unsigned int   iv_size  =  crypto_aead_ivsize (tfm );
@@ -4240,9 +4240,8 @@ static void *smb2_aead_req_alloc(struct crypto_aead *tfm, const struct smb_rqst
42404240	len  +=  req_size ;
42414241	len  =  ALIGN (len , __alignof__(struct  scatterlist ));
42424242	len  +=  array_size (* num_sgs , sizeof (struct  scatterlist ));
4243- 	* sensitive_size  =  len ;
42444243
4245- 	p  =  kvzalloc (len , GFP_NOFS );
4244+ 	p  =  kzalloc (len , GFP_NOFS );
42464245	if  (!p )
42474246		return  ERR_PTR (- ENOMEM );
42484247
@@ -4256,16 +4255,14 @@ static void *smb2_aead_req_alloc(struct crypto_aead *tfm, const struct smb_rqst
42564255
42574256static  void  * smb2_get_aead_req (struct  crypto_aead  * tfm , struct  smb_rqst  * rqst ,
42584257			       int  num_rqst , const  u8  * sig , u8  * * iv ,
4259- 			       struct  aead_request  * * req , struct  scatterlist  * * sgl ,
4260- 			       size_t  * sensitive_size )
4258+ 			       struct  aead_request  * * req , struct  scatterlist  * * sgl )
42614259{
42624260	struct  sg_table  sgtable  =  {};
42634261	unsigned int   skip , num_sgs , i , j ;
42644262	ssize_t  rc ;
42654263	void  * p ;
42664264
4267- 	p  =  smb2_aead_req_alloc (tfm , rqst , num_rqst , sig , iv , req , & sgtable ,
4268- 				& num_sgs , sensitive_size );
4265+ 	p  =  smb2_aead_req_alloc (tfm , rqst , num_rqst , sig , iv , req , & sgtable , & num_sgs );
42694266	if  (IS_ERR (p ))
42704267		return  ERR_CAST (p );
42714268
@@ -4354,7 +4351,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43544351	DECLARE_CRYPTO_WAIT (wait );
43554352	unsigned int   crypt_len  =  le32_to_cpu (tr_hdr -> OriginalMessageSize );
43564353	void  * creq ;
4357- 	size_t  sensitive_size ;
43584354
43594355	rc  =  smb2_get_enc_key (server , le64_to_cpu (tr_hdr -> SessionId ), enc , key );
43604356	if  (rc ) {
@@ -4380,8 +4376,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
43804376		return  rc ;
43814377	}
43824378
4383- 	creq  =  smb2_get_aead_req (tfm , rqst , num_rqst , sign , & iv , & req , & sg ,
4384- 				 & sensitive_size );
4379+ 	creq  =  smb2_get_aead_req (tfm , rqst , num_rqst , sign , & iv , & req , & sg );
43854380	if  (IS_ERR (creq ))
43864381		return  PTR_ERR (creq );
43874382
@@ -4411,7 +4406,7 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst,
44114406	if  (!rc  &&  enc )
44124407		memcpy (& tr_hdr -> Signature , sign , SMB2_SIGNATURE_SIZE );
44134408
4414- 	kvfree_sensitive (creq ,  sensitive_size );
4409+ 	kfree_sensitive (creq );
44154410	return  rc ;
44164411}
44174412
0 commit comments