[src/trunk]: src/sys/opencrypto cryptosoft(4): Prune dead branches. Assert s...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1111a6158720
branches:  trunk
changeset: 366332:1111a6158720
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun May 22 11:38:59 2022 +0000

description:
cryptosoft(4): Prune dead branches.  Assert session id validity.

diffstat:

 sys/opencrypto/cryptosoft.c |  13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diffs (41 lines):

diff -r 0215f475f349 -r 1111a6158720 sys/opencrypto/cryptosoft.c
--- a/sys/opencrypto/cryptosoft.c       Sun May 22 11:38:51 2022 +0000
+++ b/sys/opencrypto/cryptosoft.c       Sun May 22 11:38:59 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cryptosoft.c,v 1.62 2022/05/22 11:29:25 riastradh Exp $ */
+/*     $NetBSD: cryptosoft.c,v 1.63 2022/05/22 11:38:59 riastradh Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $       */
 /*     $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
 
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.62 2022/05/22 11:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.63 2022/05/22 11:38:59 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -766,9 +766,6 @@
        u_int32_t i;
        int k, error;
 
-       if (sid == NULL || cri == NULL)
-               return EINVAL;
-
        if (swcr_sessions) {
                for (i = 1; i < swcr_sesnum; i++)
                        if (swcr_sessions[i] == NULL)
@@ -1128,9 +1125,9 @@
        struct swcr_data *swd;
        u_int32_t sid = ((u_int32_t) tid) & 0xffffffff;
 
-       if (sid > swcr_sesnum || swcr_sessions == NULL ||
-           swcr_sessions[sid] == NULL)
-               return EINVAL;
+       KASSERTMSG(sid < swcr_sesnum, "sid=%"PRIu32" swcr_sesnum=%"PRIu32,
+           sid, swcr_sesnum);
+       KASSERT(swcr_sessions[sid]);
 
        swd = swcr_sessions[sid];
        swcr_sessions[sid] = NULL;