projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'folio-5.18d' of git://git.infradead.org/users/willy/pagecache
[linux-2.6-microblaze.git]
/
drivers
/
s390
/
crypto
/
zcrypt_ep11misc.c
diff --git
a/drivers/s390/crypto/zcrypt_ep11misc.c
b/drivers/s390/crypto/zcrypt_ep11misc.c
index
9ce5a71
..
98d33f9
100644
(file)
--- a/
drivers/s390/crypto/zcrypt_ep11misc.c
+++ b/
drivers/s390/crypto/zcrypt_ep11misc.c
@@
-1109,7
+1109,7
@@
static int ep11_wrapkey(u16 card, u16 domain,
if (kb->head.type == TOKTYPE_NON_CCA &&
kb->head.version == TOKVER_EP11_AES) {
has_header = true;
- keysize =
kb->head.len < keysize ? kb->head.len : keysize
;
+ keysize =
min_t(size_t, kb->head.len, keysize)
;
}
/* request cprb and payload */