Commit 2004b57c authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Heiko Carstens
Browse files

s390/zcrypt: code cleanup 



This patch tries to fix as much as possible of the
checkpatch.pl --strict findings:
  CHECK: Logical continuations should be on the previous line
  CHECK: No space is necessary after a cast
  CHECK: Alignment should match open parenthesis
  CHECK: 'useable' may be misspelled - perhaps 'usable'?
  WARNING: Possible repeated word: 'is'
  CHECK: spaces preferred around that '*' (ctx:VxV)
  CHECK: Comparison to NULL could be written "!msg"
  CHECK: Prefer kzalloc(sizeof(*zc)...) over kzalloc(sizeof(struct...)...)
  CHECK: Unnecessary parentheses around resp_type->work
  CHECK: Avoid CamelCase: <xcRB>

There is no functional change comming with this patch, only
code cleanup, renaming, whitespaces, indenting, ... but no
semantic change in any way. Also the API (zcrypt and pkey
header file) is semantically unchanged.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Reviewed-by: default avatarJürgen Christ <jchrist@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 6acb086d

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

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ struct pkey_skey2pkey { 
#define PKEY_SKEY2PKEY _IOWR(PKEY_IOCTL_MAGIC, 0x06, struct pkey_skey2pkey)



/*

 * Verify the given CCA AES secure key for being able to be useable with

 * Verify the given CCA AES secure key for being able to be usable with

 * the pkey module. Check for correct key type and check for having at

 * least one crypto card being able to handle this key (master key

 * or old master key verification pattern matches).

drivers/s390/crypto/ap_bus.c

+29 −27
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int ap_qci_available(void) 
 * ap_apft_available(): Test if AP facilities test (APFT)

 * facility is available.

 *

 * Returns 1 if APFT is is available.

 * Returns 1 if APFT is available.

 */

static int ap_apft_available(void)

{
@@ -812,8 +812,8 @@ static int __ap_revise_reserved(struct device *dev, void *dummy) 
		card = AP_QID_CARD(to_ap_queue(dev)->qid);

		queue = AP_QID_QUEUE(to_ap_queue(dev)->qid);

		mutex_lock(&ap_perms_mutex);

		devres = test_bit_inv(card, ap_perms.apm)

			&& test_bit_inv(queue, ap_perms.aqm);

		devres = test_bit_inv(card, ap_perms.apm) &&

			test_bit_inv(queue, ap_perms.aqm);

		mutex_unlock(&ap_perms_mutex);

		drvres = to_ap_drv(dev->driver)->flags

			& AP_DRIVER_FLAG_DEFAULT;
@@ -844,8 +844,8 @@ int ap_owned_by_def_drv(int card, int queue) 


	mutex_lock(&ap_perms_mutex);



	if (test_bit_inv(card, ap_perms.apm)

	    && test_bit_inv(queue, ap_perms.aqm))

	if (test_bit_inv(card, ap_perms.apm) &&

	    test_bit_inv(queue, ap_perms.aqm))

		rc = 1;



	mutex_unlock(&ap_perms_mutex);
@@ -894,8 +894,8 @@ static int ap_device_probe(struct device *dev) 
		card = AP_QID_CARD(to_ap_queue(dev)->qid);

		queue = AP_QID_QUEUE(to_ap_queue(dev)->qid);

		mutex_lock(&ap_perms_mutex);

		devres = test_bit_inv(card, ap_perms.apm)

			&& test_bit_inv(queue, ap_perms.aqm);

		devres = test_bit_inv(card, ap_perms.apm) &&

			test_bit_inv(queue, ap_perms.aqm);

		mutex_unlock(&ap_perms_mutex);

		drvres = ap_drv->flags & AP_DRIVER_FLAG_DEFAULT;

		if (!!devres != !!drvres)
@@ -916,8 +916,9 @@ static int ap_device_probe(struct device *dev) 
		if (is_queue_dev(dev))

			hash_del(&to_ap_queue(dev)->hnode);

		spin_unlock_bh(&ap_queues_lock);

	} else

	} else {

		ap_check_bindings_complete();

	}



out:

	if (rc)
@@ -1259,8 +1260,9 @@ static ssize_t poll_thread_store(struct bus_type *bus, 
		rc = ap_poll_thread_start();

		if (rc)

			count = rc;

	} else

	} else {

		ap_poll_thread_stop();

	}

	return count;

}
@@ -1633,9 +1635,9 @@ static int ap_get_compatible_type(ap_qid_t qid, int rawtype, unsigned int func) 
		apinfo.mode = (func >> 26) & 0x07;

		apinfo.cat = AP_DEVICE_TYPE_CEX8;

		status = ap_qact(qid, 0, &apinfo);

		if (status.response_code == AP_RESPONSE_NORMAL

		    && apinfo.cat >= AP_DEVICE_TYPE_CEX2A

		    && apinfo.cat <= AP_DEVICE_TYPE_CEX8)

		if (status.response_code == AP_RESPONSE_NORMAL &&

		    apinfo.cat >= AP_DEVICE_TYPE_CEX2A &&

		    apinfo.cat <= AP_DEVICE_TYPE_CEX8)

			comp_type = apinfo.cat;

	}

	if (!comp_type)
@@ -1673,8 +1675,8 @@ static int __match_queue_device_with_qid(struct device *dev, const void *data) 
 */

static int __match_queue_device_with_queue_id(struct device *dev, const void *data)

{

	return is_queue_dev(dev)

		&& AP_QID_QUEUE(to_ap_queue(dev)->qid) == (int)(long) data;

	return is_queue_dev(dev) &&

		AP_QID_QUEUE(to_ap_queue(dev)->qid) == (int)(long)data;

}



/* Helper function for notify_config_changed */
@@ -2137,7 +2139,7 @@ static int __init ap_debug_init(void) 


static void __init ap_perms_init(void)

{

	/* all resources useable if no kernel parameter string given */

	/* all resources usable if no kernel parameter string given */

	memset(&ap_perms.ioctlm, 0xFF, sizeof(ap_perms.ioctlm));

	memset(&ap_perms.apm, 0xFF, sizeof(ap_perms.apm));

	memset(&ap_perms.aqm, 0xFF, sizeof(ap_perms.aqm));

drivers/s390/crypto/ap_bus.h

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ struct ap_perms { 
	unsigned long aqm[BITS_TO_LONGS(AP_DOMAINS)];

	unsigned long adm[BITS_TO_LONGS(AP_DOMAINS)];

};



extern struct ap_perms ap_perms;

extern struct mutex ap_perms_mutex;

drivers/s390/crypto/ap_queue.c

+4 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int ap_recv(ap_qid_t qid, unsigned long long *psmid, void *msg, size_t length) 
{

	struct ap_queue_status status;



	if (msg == NULL)

	if (!msg)

		return -EINVAL;

	status = ap_dqap(qid, psmid, msg, length, NULL, NULL);

	switch (status.response_code) {
@@ -827,8 +827,9 @@ int ap_queue_message(struct ap_queue *aq, struct ap_message *ap_msg) 
		aq->requestq_count++;

		aq->total_request_count++;

		atomic64_inc(&aq->card->total_request_count);

	} else

	} else {

		rc = -ENODEV;

	}



	/* Send/receive as many request from the queue as possible. */

	ap_wait(ap_sm_event_loop(aq, AP_SM_EVENT_POLL));

drivers/s390/crypto/pkey_api.c

+78 −71
Original line number Diff line number Diff line
@@ -425,9 +425,9 @@ static int pkey_nonccatok2pkey(const u8 *key, u32 keylen, 
		t = (struct clearaeskeytoken *)key;

		if (keylen != sizeof(*t) + t->len)

			goto out;

		if ((t->keytype == PKEY_KEYTYPE_AES_128 && t->len == 16)

		    || (t->keytype == PKEY_KEYTYPE_AES_192 && t->len == 24)

		    || (t->keytype == PKEY_KEYTYPE_AES_256 && t->len == 32))

		if ((t->keytype == PKEY_KEYTYPE_AES_128 && t->len == 16) ||

		    (t->keytype == PKEY_KEYTYPE_AES_192 && t->len == 24) ||

		    (t->keytype == PKEY_KEYTYPE_AES_256 && t->len == 32))

			memcpy(ckey.clrkey, t->clearkey, t->len);

		else

			goto out;
@@ -541,7 +541,6 @@ int pkey_keyblob2pkey(const u8 *key, u32 keylen, 


	DEBUG_DBG("%s rc=%d\n", __func__, rc);

	return rc;



}

EXPORT_SYMBOL(pkey_keyblob2pkey);
@@ -588,9 +587,11 @@ static int pkey_genseckey2(const struct pkey_apqn *apqns, size_t nr_apqns, 
		} else if (ktype == PKEY_TYPE_CCA_DATA) {

			rc = cca_genseckey(card, dom, ksize, keybuf);

			*keybufsize = (rc ? 0 : SECKEYBLOBSIZE);

		} else /* TOKVER_CCA_VLSC */

		} else {

			/* TOKVER_CCA_VLSC */

			rc = cca_gencipherkey(card, dom, ksize, kflags,

					      keybuf, keybufsize);

		}

		if (rc == 0)

			break;

	}
@@ -645,9 +646,11 @@ static int pkey_clr2seckey2(const struct pkey_apqn *apqns, size_t nr_apqns, 
			rc = cca_clr2seckey(card, dom, ksize,

					    clrkey, keybuf);

			*keybufsize = (rc ? 0 : SECKEYBLOBSIZE);

		} else /* TOKVER_CCA_VLSC */

		} else {

			/* TOKVER_CCA_VLSC */

			rc = cca_clr2cipherkey(card, dom, ksize, kflags,

					       clrkey, keybuf, keybufsize);

		}

		if (rc == 0)

			break;

	}
@@ -667,8 +670,8 @@ static int pkey_verifykey2(const u8 *key, size_t keylen, 
	if (keylen < sizeof(struct keytoken_header))

		return -EINVAL;



	if (hdr->type == TOKTYPE_CCA_INTERNAL

	    && hdr->version == TOKVER_CCA_AES) {

	if (hdr->type == TOKTYPE_CCA_INTERNAL &&

	    hdr->version == TOKVER_CCA_AES) {

		struct secaeskeytoken *t = (struct secaeskeytoken *)key;



		rc = cca_check_secaeskeytoken(debug_info, 3, key, 0);
@@ -697,8 +700,8 @@ static int pkey_verifykey2(const u8 *key, size_t keylen, 
		*cardnr = ((struct pkey_apqn *)_apqns)->card;

		*domain = ((struct pkey_apqn *)_apqns)->domain;



	} else if (hdr->type == TOKTYPE_CCA_INTERNAL

		   && hdr->version == TOKVER_CCA_VLSC) {

	} else if (hdr->type == TOKTYPE_CCA_INTERNAL &&

		   hdr->version == TOKVER_CCA_VLSC) {

		struct cipherkeytoken *t = (struct cipherkeytoken *)key;



		rc = cca_check_secaescipherkey(debug_info, 3, key, 0, 1);
@@ -734,8 +737,8 @@ static int pkey_verifykey2(const u8 *key, size_t keylen, 
		*cardnr = ((struct pkey_apqn *)_apqns)->card;

		*domain = ((struct pkey_apqn *)_apqns)->domain;



	} else if (hdr->type == TOKTYPE_NON_CCA

		   && hdr->version == TOKVER_EP11_AES) {

	} else if (hdr->type == TOKTYPE_NON_CCA &&

		   hdr->version == TOKVER_EP11_AES) {

		struct ep11keyblob *kb = (struct ep11keyblob *)key;



		rc = ep11_check_aes_key(debug_info, 3, key, keylen, 1);
@@ -757,8 +760,9 @@ static int pkey_verifykey2(const u8 *key, size_t keylen, 
		*cardnr = ((struct pkey_apqn *)_apqns)->card;

		*domain = ((struct pkey_apqn *)_apqns)->domain;



	} else

	} else {

		rc = -EINVAL;

	}



out:

	kfree(_apqns);
@@ -816,15 +820,16 @@ static int pkey_keyblob2pkey2(const struct pkey_apqn *apqns, size_t nr_apqns, 
	for (i = 0, rc = -ENODEV; i < nr_apqns; i++) {

		card = apqns[i].card;

		dom = apqns[i].domain;

		if (hdr->type == TOKTYPE_CCA_INTERNAL

		    && hdr->version == TOKVER_CCA_AES)

		if (hdr->type == TOKTYPE_CCA_INTERNAL &&

		    hdr->version == TOKVER_CCA_AES) {

			rc = cca_sec2protkey(card, dom, key, pkey->protkey,

					     &pkey->len, &pkey->type);

		else if (hdr->type == TOKTYPE_CCA_INTERNAL

			 && hdr->version == TOKVER_CCA_VLSC)

		} else if (hdr->type == TOKTYPE_CCA_INTERNAL &&

			   hdr->version == TOKVER_CCA_VLSC) {

			rc = cca_cipher2protkey(card, dom, key, pkey->protkey,

						&pkey->len, &pkey->type);

		else { /* EP11 AES secure key blob */

		} else {

			/* EP11 AES secure key blob */

			struct ep11keyblob *kb = (struct ep11keyblob *)key;



			pkey->len = sizeof(pkey->protkey);
@@ -851,10 +856,10 @@ static int pkey_apqns4key(const u8 *key, size_t keylen, u32 flags, 


	zcrypt_wait_api_operational();



	if (hdr->type == TOKTYPE_NON_CCA

	    && (hdr->version == TOKVER_EP11_AES_WITH_HEADER

		|| hdr->version == TOKVER_EP11_ECC_WITH_HEADER)

	    && is_ep11_keyblob(key + sizeof(struct ep11kblob_header))) {

	if (hdr->type == TOKTYPE_NON_CCA &&

	    (hdr->version == TOKVER_EP11_AES_WITH_HEADER ||

	     hdr->version == TOKVER_EP11_ECC_WITH_HEADER) &&

	    is_ep11_keyblob(key + sizeof(struct ep11kblob_header))) {

		int minhwtype = 0, api = 0;

		struct ep11keyblob *kb = (struct ep11keyblob *)

			(key + sizeof(struct ep11kblob_header));
@@ -869,9 +874,9 @@ static int pkey_apqns4key(const u8 *key, size_t keylen, u32 flags, 
				    minhwtype, api, kb->wkvp);

		if (rc)

			goto out;

	} else if (hdr->type == TOKTYPE_NON_CCA

		   && hdr->version == TOKVER_EP11_AES

		   && is_ep11_keyblob(key)) {

	} else if (hdr->type == TOKTYPE_NON_CCA &&

		   hdr->version == TOKVER_EP11_AES &&

		   is_ep11_keyblob(key)) {

		int minhwtype = 0, api = 0;

		struct ep11keyblob *kb = (struct ep11keyblob *)key;
@@ -931,8 +936,9 @@ static int pkey_apqns4key(const u8 *key, size_t keylen, u32 flags, 
				   cur_mkvp, old_mkvp, 1);

		if (rc)

			goto out;

	} else

	} else {

		return -EINVAL;

	}



	if (apqns) {

		if (*nr_apqns < _nr_apqns)
@@ -996,8 +1002,9 @@ static int pkey_apqns4keytype(enum pkey_key_type ktype, 
		if (rc)

			goto out;



	} else

	} else {

		return -EINVAL;

	}



	if (apqns) {

		if (*nr_apqns < _nr_apqns)
@@ -1026,21 +1033,21 @@ static int pkey_keyblob2pkey3(const struct pkey_apqn *apqns, size_t nr_apqns, 
	if (keylen < sizeof(struct keytoken_header))

		return -EINVAL;



	if (hdr->type == TOKTYPE_NON_CCA

	    && hdr->version == TOKVER_EP11_AES_WITH_HEADER

	    && is_ep11_keyblob(key + sizeof(struct ep11kblob_header))) {

	if (hdr->type == TOKTYPE_NON_CCA &&

	    hdr->version == TOKVER_EP11_AES_WITH_HEADER &&

	    is_ep11_keyblob(key + sizeof(struct ep11kblob_header))) {

		/* EP11 AES key blob with header */

		if (ep11_check_aes_key_with_hdr(debug_info, 3, key, keylen, 1))

			return -EINVAL;

	} else if (hdr->type == TOKTYPE_NON_CCA

		   && hdr->version == TOKVER_EP11_ECC_WITH_HEADER

		   && is_ep11_keyblob(key + sizeof(struct ep11kblob_header))) {

	} else if (hdr->type == TOKTYPE_NON_CCA &&

		   hdr->version == TOKVER_EP11_ECC_WITH_HEADER &&

		   is_ep11_keyblob(key + sizeof(struct ep11kblob_header))) {

		/* EP11 ECC key blob with header */

		if (ep11_check_ecc_key_with_hdr(debug_info, 3, key, keylen, 1))

			return -EINVAL;

	} else if (hdr->type == TOKTYPE_NON_CCA

		   && hdr->version == TOKVER_EP11_AES

		   && is_ep11_keyblob(key)) {

	} else if (hdr->type == TOKTYPE_NON_CCA &&

		   hdr->version == TOKVER_EP11_AES &&

		   is_ep11_keyblob(key)) {

		/* EP11 AES key blob with header in session field */

		if (ep11_check_aes_key(debug_info, 3, key, keylen, 1))

			return -EINVAL;
@@ -1088,15 +1095,15 @@ static int pkey_keyblob2pkey3(const struct pkey_apqn *apqns, size_t nr_apqns, 
	for (rc = -ENODEV, i = 0; rc && i < nr_apqns; i++) {

		card = apqns[i].card;

		dom = apqns[i].domain;

		if (hdr->type == TOKTYPE_NON_CCA

		    && (hdr->version == TOKVER_EP11_AES_WITH_HEADER

			|| hdr->version == TOKVER_EP11_ECC_WITH_HEADER)

		    && is_ep11_keyblob(key + sizeof(struct ep11kblob_header)))

		if (hdr->type == TOKTYPE_NON_CCA &&

		    (hdr->version == TOKVER_EP11_AES_WITH_HEADER ||

		     hdr->version == TOKVER_EP11_ECC_WITH_HEADER) &&

		    is_ep11_keyblob(key + sizeof(struct ep11kblob_header)))

			rc = ep11_kblob2protkey(card, dom, key, hdr->len,

						protkey, protkeylen, protkeytype);

		else if (hdr->type == TOKTYPE_NON_CCA

			 && hdr->version == TOKVER_EP11_AES

			 && is_ep11_keyblob(key))

		else if (hdr->type == TOKTYPE_NON_CCA &&

			 hdr->version == TOKVER_EP11_AES &&

			 is_ep11_keyblob(key))

			rc = ep11_kblob2protkey(card, dom, key, hdr->len,

						protkey, protkeylen, protkeytype);

		else if (hdr->type == TOKTYPE_CCA_INTERNAL &&