Hi,
The function crypto-dispatch() never returns an error. Make it
void to avoid error handling in the callers.
ok?
bluhm
Index: crypto/crypto.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/crypto/crypto.c,v
retrieving revision 1.86
diff -u -p -r1.86 crypto.c
--- crypto/crypto.c 13 Oct 2021 13:08:58 -0000 1.86
+++ crypto/crypto.c 13 Oct 2021 20:13:15 -0000
@@ -384,10 +384,10 @@ crypto_unregister(u_int32_t driverid, in
/*
* Add crypto request to a queue, to be processed by a kernel thread.
*/
-int
+void
crypto_dispatch(struct cryptop *crp)
{
- int error = 0, lock = 1, s;
+ int lock = 1, s;
u_int32_t hid;
s = splvm();
@@ -414,8 +414,6 @@ crypto_dispatch(struct cryptop *crp)
task_set(&crp->crp_task, (void (*))crypto_invoke, crp);
task_add(tq, &crp->crp_task);
}
-
- return error;
}
/*
Index: crypto/cryptodev.h
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/crypto/cryptodev.h,v
retrieving revision 1.75
diff -u -p -r1.75 cryptodev.h
--- crypto/cryptodev.h 13 Oct 2021 13:08:58 -0000 1.75
+++ crypto/cryptodev.h 13 Oct 2021 20:13:15 -0000
@@ -218,7 +218,7 @@ void crypto_init(void);
int crypto_newsession(u_int64_t *, struct cryptoini *, int);
int crypto_freesession(u_int64_t);
-int crypto_dispatch(struct cryptop *);
+void crypto_dispatch(struct cryptop *);
int crypto_register(u_int32_t, int *,
int (*)(u_int32_t *, struct cryptoini *), int (*)(u_int64_t),
int (*)(struct cryptop *));
Index: dev/softraid_crypto.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/dev/softraid_crypto.c,v
retrieving revision 1.141
diff -u -p -r1.141 softraid_crypto.c
--- dev/softraid_crypto.c 10 May 2021 08:17:07 -0000 1.141
+++ dev/softraid_crypto.c 13 Oct 2021 20:13:15 -0000
@@ -1157,7 +1157,7 @@ sr_crypto_rw(struct sr_workunit *wu)
struct sr_crypto_wu *crwu;
struct sr_crypto *mdd_crypto;
daddr_t blkno;
- int rv = 0;
+ int rv;
DNPRINTF(SR_D_DIS, "%s: sr_crypto_rw wu %p\n",
DEVNAME(wu->swu_dis->sd_sc), wu);
@@ -1169,9 +1169,8 @@ sr_crypto_rw(struct sr_workunit *wu)
mdd_crypto = &wu->swu_dis->mds.mdd_crypto;
crwu = sr_crypto_prepare(wu, mdd_crypto, 1);
crwu->cr_crp->crp_callback = sr_crypto_write;
- rv = crypto_dispatch(crwu->cr_crp);
- if (rv == 0)
- rv = crwu->cr_crp->crp_etype;
+ crypto_dispatch(crwu->cr_crp);
+ rv = crwu->cr_crp->crp_etype;
} else
rv = sr_crypto_dev_rw(wu, NULL);
Index: dev/softraid_raid1c.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/dev/softraid_raid1c.c,v
retrieving revision 1.3
diff -u -p -r1.3 softraid_raid1c.c
--- dev/softraid_raid1c.c 10 May 2021 08:17:07 -0000 1.3
+++ dev/softraid_raid1c.c 13 Oct 2021 20:06:49 -0000
@@ -346,7 +346,7 @@ sr_raid1c_rw(struct sr_workunit *wu)
struct sr_crypto_wu *crwu;
struct sr_raid1c *mdd_raid1c;
daddr_t blkno;
- int rv = 0;
+ int rv;
DNPRINTF(SR_D_DIS, "%s: sr_raid1c_rw wu %p\n",
DEVNAME(wu->swu_dis->sd_sc), wu);
@@ -359,9 +359,8 @@ sr_raid1c_rw(struct sr_workunit *wu)
mdd_raid1c = &wu->swu_dis->mds.mdd_raid1c;
crwu = sr_crypto_prepare(wu, &mdd_raid1c->sr1c_crypto, 1);
crwu->cr_crp->crp_callback = sr_raid1c_write;
- rv = crypto_dispatch(crwu->cr_crp);
- if (rv == 0)
- rv = crwu->cr_crp->crp_etype;
+ crypto_dispatch(crwu->cr_crp);
+ rv = crwu->cr_crp->crp_etype;
} else
rv = sr_raid1c_dev_rw(wu, NULL);
Index: netinet/ip_ah.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_ah.c,v
retrieving revision 1.155
diff -u -p -r1.155 ip_ah.c
--- netinet/ip_ah.c 13 Oct 2021 14:36:31 -0000 1.155
+++ netinet/ip_ah.c 13 Oct 2021 20:13:15 -0000
@@ -699,8 +699,8 @@ ah_input(struct mbuf *m, struct tdb *tdb
memcpy(&tc->tc_dst, &tdb->tdb_dst, sizeof(union sockaddr_union));
tc->tc_rpl = tdb->tdb_rpl;
- error = crypto_dispatch(crp);
- return error;
+ crypto_dispatch(crp);
+ return 0;
drop:
m_freem(m);
@@ -1145,8 +1145,8 @@ ah_output(struct mbuf *m, struct tdb *td
tc->tc_rdomain = tdb->tdb_rdomain;
memcpy(&tc->tc_dst, &tdb->tdb_dst, sizeof(union sockaddr_union));
- error = crypto_dispatch(crp);
- return error;
+ crypto_dispatch(crp);
+ return 0;
drop:
m_freem(m);
Index: netinet/ip_esp.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_esp.c,v
retrieving revision 1.173
diff -u -p -r1.173 ip_esp.c
--- netinet/ip_esp.c 13 Oct 2021 14:36:31 -0000 1.173
+++ netinet/ip_esp.c 13 Oct 2021 20:13:15 -0000
@@ -528,8 +528,8 @@ esp_input(struct mbuf *m, struct tdb *td
crde->crd_len = m->m_pkthdr.len - (skip + hlen + alen);
}
- error = crypto_dispatch(crp);
- return error;
+ crypto_dispatch(crp);
+ return 0;
drop:
m_freem(m);
@@ -1012,8 +1012,8 @@ esp_output(struct mbuf *m, struct tdb *t
crda->crd_len = m->m_pkthdr.len - (skip + alen);
}
- error = crypto_dispatch(crp);
- return error;
+ crypto_dispatch(crp);
+ return 0;
drop:
m_freem(m);
Index: netinet/ip_ipcomp.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_ipcomp.c,v
retrieving revision 1.75
diff -u -p -r1.75 ip_ipcomp.c
--- netinet/ip_ipcomp.c 13 Oct 2021 14:36:31 -0000 1.75
+++ netinet/ip_ipcomp.c 13 Oct 2021 20:13:15 -0000
@@ -139,7 +139,7 @@ ipcomp_input(struct mbuf *m, struct tdb
{
const struct comp_algo *ipcompx = tdb->tdb_compalgxform;
struct tdb_crypto *tc;
- int hlen, error;
+ int hlen;
struct cryptodesc *crdc = NULL;
struct cryptop *crp;
@@ -188,8 +188,8 @@ ipcomp_input(struct mbuf *m, struct tdb
tc->tc_rdomain = tdb->tdb_rdomain;
tc->tc_dst = tdb->tdb_dst;
- error = crypto_dispatch(crp);
- return error;
+ crypto_dispatch(crp);
+ return 0;
}
int
@@ -482,8 +482,8 @@ ipcomp_output(struct mbuf *m, struct tdb
crp->crp_opaque = (caddr_t)tc;
crp->crp_sid = tdb->tdb_cryptoid;
- error = crypto_dispatch(crp);
- return error;
+ crypto_dispatch(crp);
+ return 0;
drop:
m_freem(m);
Index: netinet/ipsec_input.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ipsec_input.c,v
retrieving revision 1.182
diff -u -p -r1.182 ipsec_input.c
--- netinet/ipsec_input.c 5 Oct 2021 11:45:26 -0000 1.182
+++ netinet/ipsec_input.c 13 Oct 2021 20:13:15 -0000
@@ -401,11 +401,7 @@ ipsec_input_cb(struct cryptop *crp)
/* Reset the session ID */
if (tdb->tdb_cryptoid != 0)
tdb->tdb_cryptoid = crp->crp_sid;
- error = crypto_dispatch(crp);
- if (error) {
- DPRINTF("crypto dispatch error %d", error);
- goto drop;
- }
+ crypto_dispatch(crp);
return;
}
DPRINTF("crypto error %d", crp->crp_etype);
Index: netinet/ipsec_output.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ipsec_output.c,v
retrieving revision 1.88
diff -u -p -r1.88 ipsec_output.c
--- netinet/ipsec_output.c 13 Oct 2021 14:36:31 -0000 1.88
+++ netinet/ipsec_output.c 13 Oct 2021 20:13:15 -0000
@@ -409,11 +409,7 @@ ipsec_output_cb(struct cryptop *crp)
/* Reset the session ID */
if (tdb->tdb_cryptoid != 0)
tdb->tdb_cryptoid = crp->crp_sid;
- error = crypto_dispatch(crp);
- if (error) {
- DPRINTF("crypto dispatch error %d", error);
- goto drop;
- }
+ crypto_dispatch(crp);
return;
}
DPRINTF("crypto error %d", crp->crp_etype);
