diff options
| author | jmg <jmg@FreeBSD.org> | 2014-03-11 01:41:09 +0000 |
|---|---|---|
| committer | jmg <jmg@FreeBSD.org> | 2014-03-11 01:41:09 +0000 |
| commit | 3a0a47e77ad61c056388421e3df37d383d4bcc49 (patch) | |
| tree | dd3af4fa449439783385580041856a9cd1263dd3 /sys/opencrypto | |
| parent | 6863d653795b736b22625849d170db8bad56b471 (diff) | |
| download | FreeBSD-src-3a0a47e77ad61c056388421e3df37d383d4bcc49.zip FreeBSD-src-3a0a47e77ad61c056388421e3df37d383d4bcc49.tar.gz | |
some minor clean up.. Always _ZERO memory so mtx_init won't panic...
use the proper macro instead of hand rolling it...
Reviewed by: jhb (only the malloc change)
MFC after: 1 week
Diffstat (limited to 'sys/opencrypto')
| -rw-r--r-- | sys/opencrypto/cryptodev.c | 5 | ||||
| -rw-r--r-- | sys/opencrypto/cryptosoft.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index 44bfa5c..5e949ca 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -1044,12 +1044,7 @@ csecreate(struct fcrypt *fcr, u_int64_t sid, caddr_t key, u_int64_t keylen, { struct csession *cse; -#ifdef INVARIANTS - /* NB: required when mtx_init is built with INVARIANTS */ cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT | M_ZERO); -#else - cse = malloc(sizeof(struct csession), M_XDATA, M_NOWAIT); -#endif if (cse == NULL) return NULL; mtx_init(&cse->lock, "cryptodev", "crypto session lock", MTX_DEF); diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 4095e89..a0875ff 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -1003,7 +1003,7 @@ swcr_process(device_t dev, struct cryptop *crp, int hint) goto done; } - lid = crp->crp_sid & 0xffffffff; + lid = CRYPTO_SESID2LID(crp->crp_sid); rw_rlock(&swcr_sessions_lock); if (swcr_sessions == NULL || lid >= swcr_sesnum || lid == 0 || swcr_sessions[lid] == NULL) { |
