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

s390/zcrypt: fix wrong offset index for APKA master key valid state 



Tests showed a mismatch between what the CCA tool reports about
the APKA master key state and what's displayed by the zcrypt dd
in sysfs. After some investigation, we found out that the
documentation which was the source for the zcrypt dd implementation
lacks the listing of 3 fields. So this patch now moves the
evaluation of the APKA master key state to the correct offset.

Signed-off-by: default avatarHarald Freudenberger <freude@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent cf6031d0

drivers/s390/crypto/zcrypt_ccamisc.c

+4 −4
Original line number Diff line number Diff line
@@ -1724,10 +1724,10 @@ static int fetch_cca_info(u16 cardnr, u16 domain, struct cca_info *ci) 
	rlen = vlen = PAGE_SIZE/2;

	rc = cca_query_crypto_facility(cardnr, domain, "STATICSB",

				       rarray, &rlen, varray, &vlen);

	if (rc == 0 && rlen >= 10*8 && vlen >= 240) {

		ci->new_apka_mk_state = (char) rarray[7*8];

		ci->cur_apka_mk_state = (char) rarray[8*8];

		ci->old_apka_mk_state = (char) rarray[9*8];

	if (rc == 0 && rlen >= 13*8 && vlen >= 240) {

		ci->new_apka_mk_state = (char) rarray[10*8];

		ci->cur_apka_mk_state = (char) rarray[11*8];

		ci->old_apka_mk_state = (char) rarray[12*8];

		if (ci->old_apka_mk_state == '2')

			memcpy(&ci->old_apka_mkvp, varray + 208, 8);

		if (ci->cur_apka_mk_state == '2')