system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 04:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

/dev/crypto: Store blocksize in cse rather than txform pointer.

Browse source 
Reviewed by:	markj
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D33614
This commit is contained in:
John Baldwin 2021-12-29 17:50:23 -08:00
parent c3907ef482
commit 61ff0a1f81
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/opencrypto/cryptodev.c
View file

@ -269,7 +269,7 @@ struct csession {
uint32_t ses;
struct mtx lock; /* for op submission */
const struct enc_xform *txform;
u_int blocksize;
int hashsize;
int ivsize;
@ -499,7 +499,6 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop)
cse->key = key;
cse->mackey = mackey;
cse->cses = cses;
cse->txform = txform;
if (sop->maclen != 0)
cse->hashsize = sop->maclen;
else if (thash != NULL)
@ -508,6 +507,16 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop)
cse->hashsize = txform->macsize;
cse->ivsize = csp.csp_ivlen;
/*
* NB: This isn't necessarily the block size of the underlying
* MAC or cipher but is instead a restriction on valid input
* sizes.
*/
if (txform != NULL)
cse->blocksize = txform->blocksize;
else
cse->blocksize = 1;
mtx_lock(&fcr->lock);
TAILQ_INSERT_TAIL(&fcr->csessions, cse, next);
cse->ses = fcr->sesn++;
@ -635,11 +644,9 @@ cryptodev_op(struct csession *cse, const struct crypt_op *cop)
return (E2BIG);
}
if (cse->txform) {
if ((cop->len % cse->txform->blocksize) != 0) {
SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__);
return (EINVAL);
}
if ((cop->len % cse->blocksize) != 0) {
SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__);
return (EINVAL);
}
if (cop->mac && cse->hashsize == 0) {
@ -866,8 +873,12 @@ cryptodev_aead(struct csession *cse, struct crypt_aead *caead)
return (E2BIG);
}
if (cse->txform == NULL || cse->hashsize == 0 || caead->tag == NULL ||
(caead->len % cse->txform->blocksize) != 0) {
if ((caead->len % cse->blocksize) != 0) {
SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__);
return (EINVAL);
}
if (cse->hashsize == 0 || caead->tag == NULL) {
SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__);
return (EINVAL);
}