summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-05-22 11:38:51 +0000
committerriastradh <riastradh@NetBSD.org>2022-05-22 11:38:51 +0000
commitc9ee7a86aca27a3ae62ccaa534eb8a86cd1d1ba7 (patch)
tree94de123b9fa96496cad136a7daec52a3dcd4d638 /sys/dev
parent0ad9bc4ee3fc24dae42160a5bc898b537a455e44 (diff)
mvxpsec(4): Prune dead branches. Assert session id validity.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/marvell/mvxpsec.c20
1 files changed, 6 insertions, 14 deletions
diff --git a/sys/dev/marvell/mvxpsec.c b/sys/dev/marvell/mvxpsec.c
index 1c753589706..5510caf79f1 100644
--- a/sys/dev/marvell/mvxpsec.c
+++ b/sys/dev/marvell/mvxpsec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mvxpsec.c,v 1.14 2022/04/12 21:05:37 andvar Exp $ */
+/* $NetBSD: mvxpsec.c,v 1.15 2022/05/22 11:38:51 riastradh Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
* All rights reserved.
@@ -2029,21 +2029,13 @@ mvxpsec_freesession(void *arg, uint64_t tid)
uint32_t sid = ((uint32_t)tid) & 0xffffffff;
session = MVXPSEC_SESSION(sid);
- if (session < 0 || session >= MVXPSEC_MAX_SESSIONS) {
- log(LOG_ERR, "%s: invalid session (id:%u)\n",
- __func__, session);
- return EINVAL;
- }
+ KASSERTMSG(session >= 0, "session=%d", session);
+ KASSERTMSG(session < MVXPSEC_MAX_SESSIONS, "session=%d max=%d",
+ session, MVXPSEC_MAX_SESSIONS);
mutex_enter(&sc->sc_session_mtx);
- if ( (mv_s = sc->sc_sessions[session]) == NULL) {
- mutex_exit(&sc->sc_session_mtx);
-#ifdef DEBUG
- log(LOG_DEBUG, "%s: session %d already inactivated\n",
- __func__, session);
-#endif
- return ENOENT;
- }
+ mv_s = sc->sc_sessions[session];
+ KASSERT(mv_s != NULL);
MVXPSEC_PRINTF(MVXPSEC_DEBUG_OPENCRYPTO,
"%s: inactivate session %d\n", __func__, session);