Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf2957f3 authored by Harald Freudenberger's avatar Harald Freudenberger Committed by Vasily Gorbik
Browse files

s390/zcrypt: CEX7S exploitation support 



This patch adds CEX7 exploitation support for the AP bus code,
the zcrypt device driver zoo and the vfio device driver.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Reviewed-by: default avatarIngo Franzki <ifranzki@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent b91d9e67

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

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 *

 *  zcrypt 2.2.1 (user-visible header)

 *

 *  Copyright IBM Corp. 2001, 2018

 *  Copyright IBM Corp. 2001, 2019

 *  Author(s): Robert Burroughs

 *	       Eric Rossman (edrossma@us.ibm.com)

 *
@@ -286,7 +286,7 @@ struct zcrypt_device_matrix_ext { 
 *	 0x08: CEX3A

 *	 0x0a: CEX4

 *	 0x0b: CEX5

 *	 0x0c: CEX6

 *	 0x0c: CEX6 and CEX7

 *	 0x0d: device is disabled

 *

 *   ZCRYPT_QDEPTH_MASK

drivers/s390/crypto/ap_bus.c

+6 −6
Original line number Diff line number Diff line
@@ -1322,24 +1322,24 @@ static int ap_get_compatible_type(ap_qid_t qid, int rawtype, unsigned int func) 
	/* < CEX2A is not supported */

	if (rawtype < AP_DEVICE_TYPE_CEX2A)

		return 0;

	/* up to CEX6 known and fully supported */

	if (rawtype <= AP_DEVICE_TYPE_CEX6)

	/* up to CEX7 known and fully supported */

	if (rawtype <= AP_DEVICE_TYPE_CEX7)

		return rawtype;

	/*

	 * unknown new type > CEX6, check for compatibility

	 * unknown new type > CEX7, check for compatibility

	 * to the highest known and supported type which is

	 * currently CEX6 with the help of the QACT function.

	 * currently CEX7 with the help of the QACT function.

	 */

	if (ap_qact_available()) {

		struct ap_queue_status status;

		union ap_qact_ap_info apinfo = {0};



		apinfo.mode = (func >> 26) & 0x07;

		apinfo.cat = AP_DEVICE_TYPE_CEX6;

		apinfo.cat = AP_DEVICE_TYPE_CEX7;

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

		if (status.response_code == AP_RESPONSE_NORMAL

		    && apinfo.cat >= AP_DEVICE_TYPE_CEX2A

		    && apinfo.cat <= AP_DEVICE_TYPE_CEX6)

		    && apinfo.cat <= AP_DEVICE_TYPE_CEX7)

			comp_type = apinfo.cat;

	}

	if (!comp_type)

drivers/s390/crypto/ap_bus.h

+2 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright IBM Corp. 2006, 2012

 * Copyright IBM Corp. 2006, 2019

 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 *	      Martin Schwidefsky <schwidefsky@de.ibm.com>

 *	      Ralph Wuerthner <rwuerthn@de.ibm.com>
@@ -63,6 +63,7 @@ static inline int ap_test_bit(unsigned int *ptr, unsigned int nr) 
#define AP_DEVICE_TYPE_CEX4	10

#define AP_DEVICE_TYPE_CEX5	11

#define AP_DEVICE_TYPE_CEX6	12

#define AP_DEVICE_TYPE_CEX7	13



/*

 * Known function facilities

drivers/s390/crypto/vfio_ap_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ static struct ap_device_id ap_queue_ids[] = { 
	  .match_flags = AP_DEVICE_ID_MATCH_QUEUE_TYPE },

	{ .dev_type = AP_DEVICE_TYPE_CEX6,

	  .match_flags = AP_DEVICE_ID_MATCH_QUEUE_TYPE },

	{ .dev_type = AP_DEVICE_TYPE_CEX7,

	  .match_flags = AP_DEVICE_ID_MATCH_QUEUE_TYPE },

	{ /* end of sibling */ },

};

drivers/s390/crypto/zcrypt_api.h

+2 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 *  Copyright IBM Corp. 2001, 2018

 *  Copyright IBM Corp. 2001, 2019

 *  Author(s): Robert Burroughs

 *	       Eric Rossman (edrossma@us.ibm.com)

 *	       Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -29,6 +29,7 @@ 
#define ZCRYPT_CEX4	       10

#define ZCRYPT_CEX5	       11

#define ZCRYPT_CEX6	       12

#define ZCRYPT_CEX7	       13



/**

 * Large random numbers are pulled in 4096 byte chunks from the crypto cards