Commit 74ecbef7 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Heiko Carstens
Browse files

s390/zcrypt: code beautification and struct field renames 



Some beautifications related to the internal only used
struct ap_message and related code. Instead of one int carrying
only the special flag now a u32 flags field is used.

At struct CPRBX the pointers to additional data are now marked
with __user. This caused some changes needed on code, where
these structs are also used within the zcrypt misc functions.

The ica_rsa_* structs now use the generic types __u8, __u32, ...
instead of char, unsigned int.

zcrypt_msg6 and zcrypt_msg50 use min_t() instead of min().

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 47c07bff

arch/s390/include/uapi/asm/zcrypt.h

+70 −70
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ 
 * - length(n_modulus) = inputdatalength

 */

struct ica_rsa_modexpo {

	char __user  *inputdata;

	unsigned int  inputdatalength;

	char __user  *outputdata;

	unsigned int  outputdatalength;

	char __user  *b_key;

	char __user  *n_modulus;

	__u8 __user  *inputdata;

	__u32	      inputdatalength;

	__u8 __user  *outputdata;

	__u32	      outputdatalength;

	__u8 __user  *b_key;

	__u8 __user  *n_modulus;

};



/**
@@ -59,15 +59,15 @@ struct ica_rsa_modexpo { 
 * - length(u_mult_inv) = inputdatalength/2 + 8

 */

struct ica_rsa_modexpo_crt {

	char __user  *inputdata;

	unsigned int  inputdatalength;

	char __user  *outputdata;

	unsigned int  outputdatalength;

	char __user  *bp_key;

	char __user  *bq_key;

	char __user  *np_prime;

	char __user  *nq_prime;

	char __user  *u_mult_inv;

	__u8 __user  *inputdata;

	__u32	      inputdatalength;

	__u8 __user  *outputdata;

	__u32	      outputdatalength;

	__u8 __user  *bp_key;

	__u8 __user  *bq_key;

	__u8 __user  *np_prime;

	__u8 __user  *nq_prime;

	__u8 __user  *u_mult_inv;

};



/**
@@ -83,67 +83,67 @@ struct ica_rsa_modexpo_crt { 
 *	    key block

 */

struct CPRBX {

	unsigned short	cprb_len;	/* CPRB length	      220	 */

	unsigned char	cprb_ver_id;	/* CPRB version id.   0x02	 */

	unsigned char	pad_000[3];	/* Alignment pad bytes		 */

	unsigned char	func_id[2];	/* function id	      0x5432	 */

	unsigned char	cprb_flags[4];	/* Flags			 */

	unsigned int	req_parml;	/* request parameter buffer len	 */

	unsigned int	req_datal;	/* request data buffer		 */

	unsigned int	rpl_msgbl;	/* reply  message block length	 */

	unsigned int	rpld_parml;	/* replied parameter block len	 */

	unsigned int	rpl_datal;	/* reply data block len		 */

	unsigned int	rpld_datal;	/* replied data block len	 */

	unsigned int	req_extbl;	/* request extension block len	 */

	unsigned char	pad_001[4];	/* reserved			 */

	unsigned int	rpld_extbl;	/* replied extension block len	 */

	unsigned char	padx000[16 - sizeof(char *)];

	unsigned char  *req_parmb;	/* request parm block 'address'	 */

	unsigned char	padx001[16 - sizeof(char *)];

	unsigned char  *req_datab;	/* request data block 'address'	 */

	unsigned char	padx002[16 - sizeof(char *)];

	unsigned char  *rpl_parmb;	/* reply parm block 'address'	 */

	unsigned char	padx003[16 - sizeof(char *)];

	unsigned char  *rpl_datab;	/* reply data block 'address'	 */

	unsigned char	padx004[16 - sizeof(char *)];

	unsigned char  *req_extb;	/* request extension block 'addr'*/

	unsigned char	padx005[16 - sizeof(char *)];

	unsigned char  *rpl_extb;	/* reply extension block 'address'*/

	unsigned short	ccp_rtcode;	/* server return code		 */

	unsigned short	ccp_rscode;	/* server reason code		 */

	unsigned int	mac_data_len;	/* Mac Data Length		 */

	unsigned char	logon_id[8];	/* Logon Identifier		 */

	unsigned char	mac_value[8];	/* Mac Value			 */

	unsigned char	mac_content_flgs;/* Mac content flag byte	 */

	unsigned char	pad_002;	/* Alignment			 */

	unsigned short	domain;		/* Domain			 */

	unsigned char	usage_domain[4];/* Usage domain			 */

	unsigned char	cntrl_domain[4];/* Control domain		 */

	unsigned char	S390enf_mask[4];/* S/390 enforcement mask	 */

	unsigned char	pad_004[36];	/* reserved			 */

	__u16	     cprb_len;		/* CPRB length	      220	 */

	__u8	     cprb_ver_id;	/* CPRB version id.   0x02	 */

	__u8	     pad_000[3];	/* Alignment pad bytes		 */

	__u8	     func_id[2];	/* function id	      0x5432	 */

	__u8	     cprb_flags[4];	/* Flags			 */

	__u32	     req_parml;		/* request parameter buffer len	 */

	__u32	     req_datal;		/* request data buffer		 */

	__u32	     rpl_msgbl;		/* reply  message block length	 */

	__u32	     rpld_parml;	/* replied parameter block len	 */

	__u32	     rpl_datal;		/* reply data block len		 */

	__u32	     rpld_datal;	/* replied data block len	 */

	__u32	     req_extbl;		/* request extension block len	 */

	__u8	     pad_001[4];	/* reserved			 */

	__u32	     rpld_extbl;	/* replied extension block len	 */

	__u8	     padx000[16 - sizeof(__u8 *)];

	__u8 __user *req_parmb;		/* request parm block 'address'	 */

	__u8	     padx001[16 - sizeof(__u8 *)];

	__u8 __user *req_datab;		/* request data block 'address'	 */

	__u8	     padx002[16 - sizeof(__u8 *)];

	__u8 __user *rpl_parmb;		/* reply parm block 'address'	 */

	__u8	     padx003[16 - sizeof(__u8 *)];

	__u8 __user *rpl_datab;		/* reply data block 'address'	 */

	__u8	     padx004[16 - sizeof(__u8 *)];

	__u8 __user *req_extb;		/* request extension block 'addr'*/

	__u8	     padx005[16 - sizeof(__u8 *)];

	__u8 __user *rpl_extb;		/* reply extension block 'address'*/

	__u16	     ccp_rtcode;	/* server return code		 */

	__u16	     ccp_rscode;	/* server reason code		 */

	__u32	     mac_data_len;	/* Mac Data Length		 */

	__u8	     logon_id[8];	/* Logon Identifier		 */

	__u8	     mac_value[8];	/* Mac Value			 */

	__u8	     mac_content_flgs;	/* Mac content flag byte	 */

	__u8	     pad_002;		/* Alignment			 */

	__u16	     domain;		/* Domain			 */

	__u8	     usage_domain[4];	/* Usage domain			 */

	__u8	     cntrl_domain[4];	/* Control domain		 */

	__u8	     S390enf_mask[4];	/* S/390 enforcement mask	 */

	__u8	     pad_004[36];	/* reserved			 */

} __attribute__((packed));



/**

 * xcRB

 */

struct ica_xcRB {

	unsigned short	agent_ID;

	unsigned int	user_defined;

	unsigned short	request_ID;

	unsigned int	request_control_blk_length;

	unsigned char	padding1[16 - sizeof(char *)];

	char __user    *request_control_blk_addr;

	unsigned int	request_data_length;

	char		padding2[16 - sizeof(char *)];

	char __user    *request_data_address;

	unsigned int	reply_control_blk_length;

	char		padding3[16 - sizeof(char *)];

	char __user    *reply_control_blk_addr;

	unsigned int	reply_data_length;

	char		padding4[16 - sizeof(char *)];

	char __user    *reply_data_addr;

	unsigned short	priority_window;

	unsigned int	status;

	__u16	      agent_ID;

	__u32	      user_defined;

	__u16	      request_ID;

	__u32	      request_control_blk_length;

	__u8	      _padding1[16 - sizeof(__u8 *)];

	__u8 __user  *request_control_blk_addr;

	__u32	      request_data_length;

	__u8	      _padding2[16 - sizeof(__u8 *)];

	__u8 __user  *request_data_address;

	__u32	      reply_control_blk_length;

	__u8	      _padding3[16 - sizeof(__u8 *)];

	__u8 __user  *reply_control_blk_addr;

	__u32	      reply_data_length;

	__u8	      __padding4[16 - sizeof(__u8 *)];

	__u8 __user  *reply_data_addr;

	__u16	      priority_window;

	__u32	      status;

} __attribute__((packed));



/**

drivers/s390/crypto/ap_bus.h

+6 −5
Original line number Diff line number Diff line
@@ -190,17 +190,18 @@ typedef enum ap_wait (ap_func_t)(struct ap_queue *queue); 
struct ap_message {

	struct list_head list;		/* Request queueing. */

	unsigned long long psmid;	/* Message id. */

	void *message;			/* Pointer to message buffer. */

	size_t length;			/* Message length. */

	void *msg;			/* Pointer to message buffer. */

	unsigned int len;		/* Message length. */

	u32 flags;			/* Flags, see AP_MSG_FLAG_xxx */

	int rc;				/* Return code for this message */



	void *private;			/* ap driver private pointer. */

	unsigned int special:1;		/* Used for special commands. */

	/* receive is called from tasklet context */

	void (*receive)(struct ap_queue *, struct ap_message *,

			struct ap_message *);

};



#define AP_MSG_FLAG_SPECIAL  (1 << 16)	/* flag msg as 'special' with NQAP */



/**

 * ap_init_message() - Initialize ap_message.

 * Initialize a message before using. Otherwise this might result in
@@ -218,7 +219,7 @@ static inline void ap_init_message(struct ap_message *ap_msg) 
 */

static inline void ap_release_message(struct ap_message *ap_msg)

{

	kzfree(ap_msg->message);

	kzfree(ap_msg->msg);

	kzfree(ap_msg->private);

}

drivers/s390/crypto/ap_queue.c

+5 −4
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ static int ap_queue_enable_interruption(struct ap_queue *aq, void *ind) 
 */

static inline struct ap_queue_status

__ap_send(ap_qid_t qid, unsigned long long psmid, void *msg, size_t length,

	  unsigned int special)

	  int special)

{

	if (special == 1)

	if (special)

		qid |= 0x400000UL;

	return ap_nqap(qid, psmid, msg, length);

}
@@ -137,7 +137,7 @@ static struct ap_queue_status ap_sm_recv(struct ap_queue *aq) 
	struct ap_message *ap_msg;



	status = ap_dqap(aq->qid, &aq->reply->psmid,

			 aq->reply->message, aq->reply->length);

			 aq->reply->msg, aq->reply->len);

	switch (status.response_code) {

	case AP_RESPONSE_NORMAL:

		aq->queue_count--;
@@ -216,7 +216,8 @@ static enum ap_wait ap_sm_write(struct ap_queue *aq) 
	/* Start the next request on the queue. */

	ap_msg = list_entry(aq->requestq.next, struct ap_message, list);

	status = __ap_send(aq->qid, ap_msg->psmid,

			   ap_msg->message, ap_msg->length, ap_msg->special);

			   ap_msg->msg, ap_msg->len,

			   ap_msg->flags & AP_MSG_FLAG_SPECIAL);

	switch (status.response_code) {

	case AP_RESPONSE_NORMAL:

		aq->queue_count++;

drivers/s390/crypto/zcrypt_ccamisc.c

+38 −31
Original line number Diff line number Diff line
@@ -205,9 +205,9 @@ static int alloc_and_prep_cprbmem(size_t paramblen, 
	preqcblk->rpl_msgbl = cprbplusparamblen;

	if (paramblen) {

		preqcblk->req_parmb =

			((u8 *) preqcblk) + sizeof(struct CPRBX);

			((u8 __user *) preqcblk) + sizeof(struct CPRBX);

		preqcblk->rpl_parmb =

			((u8 *) prepcblk) + sizeof(struct CPRBX);

			((u8 __user *) prepcblk) + sizeof(struct CPRBX);

	}



	*pcprbmem = cprbmem;
@@ -274,7 +274,7 @@ int cca_genseckey(u16 cardnr, u16 domain, 
{

	int i, rc, keysize;

	int seckeysize;

	u8 *mem;

	u8 *mem, *ptr;

	struct CPRBX *preqcblk, *prepcblk;

	struct ica_xcRB xcrb;

	struct kgreqparm {
@@ -320,7 +320,7 @@ int cca_genseckey(u16 cardnr, u16 domain, 
	preqcblk->domain = domain;



	/* fill request cprb param block with KG request */

	preqparm = (struct kgreqparm *) preqcblk->req_parmb;

	preqparm = (struct kgreqparm __force *) preqcblk->req_parmb;

	memcpy(preqparm->subfunc_code, "KG", 2);

	preqparm->rule_array_len = sizeof(preqparm->rule_array_len);

	preqparm->lv1.len = sizeof(struct lv1);
@@ -377,8 +377,9 @@ int cca_genseckey(u16 cardnr, u16 domain, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct kgrepparm *) prepcblk->rpl_parmb;

	ptr =  ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct kgrepparm *) ptr;



	/* check length of the returned secure key token */

	seckeysize = prepparm->lv3.keyblock.toklen
@@ -415,7 +416,7 @@ int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize, 
		   const u8 *clrkey, u8 seckey[SECKEYBLOBSIZE])

{

	int rc, keysize, seckeysize;

	u8 *mem;

	u8 *mem, *ptr;

	struct CPRBX *preqcblk, *prepcblk;

	struct ica_xcRB xcrb;

	struct cmreqparm {
@@ -460,7 +461,7 @@ int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize, 
	preqcblk->domain = domain;



	/* fill request cprb param block with CM request */

	preqparm = (struct cmreqparm *) preqcblk->req_parmb;

	preqparm = (struct cmreqparm __force *) preqcblk->req_parmb;

	memcpy(preqparm->subfunc_code, "CM", 2);

	memcpy(preqparm->rule_array, "AES     ", 8);

	preqparm->rule_array_len =
@@ -514,8 +515,9 @@ int cca_clr2seckey(u16 cardnr, u16 domain, u32 keybitsize, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct cmrepparm *) prepcblk->rpl_parmb;

	ptr = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct cmrepparm *) ptr;



	/* check length of the returned secure key token */

	seckeysize = prepparm->lv3.keyblock.toklen
@@ -554,7 +556,7 @@ int cca_sec2protkey(u16 cardnr, u16 domain, 
		    u8 *protkey, u32 *protkeylen, u32 *protkeytype)

{

	int rc;

	u8 *mem;

	u8 *mem, *ptr;

	struct CPRBX *preqcblk, *prepcblk;

	struct ica_xcRB xcrb;

	struct uskreqparm {
@@ -605,7 +607,7 @@ int cca_sec2protkey(u16 cardnr, u16 domain, 
	preqcblk->domain = domain;



	/* fill request cprb param block with USK request */

	preqparm = (struct uskreqparm *) preqcblk->req_parmb;

	preqparm = (struct uskreqparm __force *) preqcblk->req_parmb;

	memcpy(preqparm->subfunc_code, "US", 2);

	preqparm->rule_array_len = sizeof(preqparm->rule_array_len);

	preqparm->lv1.len = sizeof(struct lv1);
@@ -646,8 +648,9 @@ int cca_sec2protkey(u16 cardnr, u16 domain, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct uskrepparm *) prepcblk->rpl_parmb;

	ptr = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct uskrepparm *) ptr;



	/* check the returned keyblock */

	if (prepparm->lv3.ckb.version != 0x01 &&
@@ -714,7 +717,7 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags, 
		     u8 *keybuf, size_t *keybufsize)

{

	int rc;

	u8 *mem;

	u8 *mem, *ptr;

	struct CPRBX *preqcblk, *prepcblk;

	struct ica_xcRB xcrb;

	struct gkreqparm {
@@ -796,7 +799,7 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags, 
	preqcblk->req_parml = sizeof(struct gkreqparm);



	/* prepare request param block with GK request */

	preqparm = (struct gkreqparm *) preqcblk->req_parmb;

	preqparm = (struct gkreqparm __force *) preqcblk->req_parmb;

	memcpy(preqparm->subfunc_code, "GK", 2);

	preqparm->rule_array_len =  sizeof(uint16_t) + 2 * 8;

	memcpy(preqparm->rule_array, "AES     OP      ", 2*8);
@@ -867,8 +870,9 @@ int cca_gencipherkey(u16 cardnr, u16 domain, u32 keybitsize, u32 keygenflags, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct gkrepparm *) prepcblk->rpl_parmb;

	ptr = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct gkrepparm *) ptr;



	/* do some plausibility checks on the key block */

	if (prepparm->kb.len < 120 + 5 * sizeof(uint16_t) ||
@@ -917,7 +921,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, 
			   int *key_token_size)

{

	int rc, n;

	u8 *mem;

	u8 *mem, *ptr;

	struct CPRBX *preqcblk, *prepcblk;

	struct ica_xcRB xcrb;

	struct rule_array_block {
@@ -974,7 +978,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, 
	preqcblk->req_parml = 0;



	/* prepare request param block with IP request */

	preq_ra_block = (struct rule_array_block *) preqcblk->req_parmb;

	preq_ra_block = (struct rule_array_block __force *) preqcblk->req_parmb;

	memcpy(preq_ra_block->subfunc_code, "IP", 2);

	preq_ra_block->rule_array_len =  sizeof(uint16_t) + 2 * 8;

	memcpy(preq_ra_block->rule_array, rule_array_1, 8);
@@ -987,7 +991,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, 
	}



	/* prepare vud block */

	preq_vud_block = (struct vud_block *)

	preq_vud_block = (struct vud_block __force *)

		(preqcblk->req_parmb + preqcblk->req_parml);

	n = complete ? 0 : (clr_key_bit_size + 7) / 8;

	preq_vud_block->len = sizeof(struct vud_block) + n;
@@ -1001,7 +1005,7 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, 
	preqcblk->req_parml += preq_vud_block->len;



	/* prepare key block */

	preq_key_block = (struct key_block *)

	preq_key_block = (struct key_block __force *)

		(preqcblk->req_parmb + preqcblk->req_parml);

	n = *key_token_size;

	preq_key_block->len = sizeof(struct key_block) + n;
@@ -1034,8 +1038,9 @@ static int _ip_cprb_helper(u16 cardnr, u16 domain, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct iprepparm *) prepcblk->rpl_parmb;

	ptr = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct iprepparm *) ptr;



	/* do some plausibility checks on the key block */

	if (prepparm->kb.len < 120 + 3 * sizeof(uint16_t) ||
@@ -1151,7 +1156,7 @@ int cca_cipher2protkey(u16 cardnr, u16 domain, const u8 *ckey, 
		       u8 *protkey, u32 *protkeylen, u32 *protkeytype)

{

	int rc;

	u8 *mem;

	u8 *mem, *ptr;

	struct CPRBX *preqcblk, *prepcblk;

	struct ica_xcRB xcrb;

	struct aureqparm {
@@ -1208,7 +1213,7 @@ int cca_cipher2protkey(u16 cardnr, u16 domain, const u8 *ckey, 
	preqcblk->domain = domain;



	/* fill request cprb param block with AU request */

	preqparm = (struct aureqparm *) preqcblk->req_parmb;

	preqparm = (struct aureqparm __force *) preqcblk->req_parmb;

	memcpy(preqparm->subfunc_code, "AU", 2);

	preqparm->rule_array_len =

		sizeof(preqparm->rule_array_len)
@@ -1257,8 +1262,9 @@ int cca_cipher2protkey(u16 cardnr, u16 domain, const u8 *ckey, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct aurepparm *) prepcblk->rpl_parmb;

	ptr = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct aurepparm *) ptr;



	/* check the returned keyblock */

	if (prepparm->vud.ckb.version != 0x01 &&
@@ -1347,7 +1353,7 @@ int cca_query_crypto_facility(u16 cardnr, u16 domain, 
	preqcblk->domain = domain;



	/* fill request cprb param block with FQ request */

	preqparm = (struct fqreqparm *) preqcblk->req_parmb;

	preqparm = (struct fqreqparm __force *) preqcblk->req_parmb;

	memcpy(preqparm->subfunc_code, "FQ", 2);

	memcpy(preqparm->rule_array, keyword, sizeof(preqparm->rule_array));

	preqparm->rule_array_len =
@@ -1378,8 +1384,9 @@ int cca_query_crypto_facility(u16 cardnr, u16 domain, 
	}



	/* process response cprb param block */

	prepcblk->rpl_parmb = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepparm = (struct fqrepparm *) prepcblk->rpl_parmb;

	ptr = ((u8 *) prepcblk) + sizeof(struct CPRBX);

	prepcblk->rpl_parmb = (u8 __user *) ptr;

	prepparm = (struct fqrepparm *) ptr;

	ptr = prepparm->lvdata;



	/* check and possibly copy reply rule array */

drivers/s390/crypto/zcrypt_cex2c.c

+7 −8
Original line number Diff line number Diff line
@@ -87,24 +87,23 @@ static int zcrypt_cex2c_rng_supported(struct ap_queue *aq) 
	int rc, i;



	ap_init_message(&ap_msg);

	ap_msg.message = (void *) get_zeroed_page(GFP_KERNEL);

	if (!ap_msg.message)

	ap_msg.msg = (void *) get_zeroed_page(GFP_KERNEL);

	if (!ap_msg.msg)

		return -ENOMEM;



	rng_type6CPRB_msgX(&ap_msg, 4, &domain);



	msg = ap_msg.message;

	msg = ap_msg.msg;

	msg->cprbx.domain = AP_QID_QUEUE(aq->qid);



	rc = ap_send(aq->qid, 0x0102030405060708ULL, ap_msg.message,

		     ap_msg.length);

	rc = ap_send(aq->qid, 0x0102030405060708ULL, ap_msg.msg, ap_msg.len);

	if (rc)

		goto out_free;



	/* Wait for the test message to complete. */

	for (i = 0; i < 2 * HZ; i++) {

		msleep(1000 / HZ);

		rc = ap_recv(aq->qid, &psmid, ap_msg.message, 4096);

		rc = ap_recv(aq->qid, &psmid, ap_msg.msg, 4096);

		if (rc == 0 && psmid == 0x0102030405060708ULL)

			break;

	}
@@ -115,13 +114,13 @@ static int zcrypt_cex2c_rng_supported(struct ap_queue *aq) 
		goto out_free;

	}



	reply = ap_msg.message;

	reply = ap_msg.msg;

	if (reply->cprbx.ccp_rtcode == 0 && reply->cprbx.ccp_rscode == 0)

		rc = 1;

	else

		rc = 0;

out_free:

	free_page((unsigned long) ap_msg.message);

	free_page((unsigned long) ap_msg.msg);

	return rc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE