leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/crypt: fix missing unlock in ctr_paes_crypt on error path

Browse Source 
The ctr mode of protected key aes uses the ctrblk page if the
ctrblk_lock could be acquired. If the protected key has to be
reestablished and this operation fails the unlock for the
ctrblk_lock is missing. Add it.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Martin Schwidefsky 2017-02-28 07:05:59 +01:00
parent 2d6be4abf5
commit e7c95effcd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/s390/crypto/paes_s390.c
View File

@ -474,8 +474,11 @@ static int ctr_paes_crypt(struct blkcipher_desc *desc, unsigned long modifier,
ret = blkcipher_walk_done(desc, walk, nbytes - n); ret = blkcipher_walk_done(desc, walk, nbytes - n);
} }
if (k < n) { if (k < n) {
if (__ctr_paes_set_key(ctx) != 0) if (__ctr_paes_set_key(ctx) != 0) {
if (locked)
spin_unlock(&ctrblk_lock);
return blkcipher_walk_done(desc, walk, -EIO); return blkcipher_walk_done(desc, walk, -EIO);
}
} }
} }
if (locked) if (locked)