Page MenuHomeFreeBSD
Files F107743278

D33614.diff
No OneTemporary
Actions

D33614.diff
View Options

diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c
--- a/sys/opencrypto/cryptodev.c
+++ b/sys/opencrypto/cryptodev.c
@@ -269,7 +269,7 @@
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->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->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 @@
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 @@
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);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 10:18 PM (21 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15899062
Default Alt Text
D33614.diff (1 KB)

Event Timeline