diff options
| author |   fcambus <fcambus@openbsd.org> | 2018-05-31 20:19:05 +0000 |
|---|---|---|
| committer | fcambus <fcambus@openbsd.org> | 2018-05-31 20:19:05 +0000 |
| commit | 7c07cf69a8de89e20765140a81741310e354dc74 (patch) | |
| tree | 7f136d25e3a90b0390508b1de7485a28d45011c0 | |
| parent | Move com_fdt.c to dev/fdt since we can share it between armv7 and arm64 now. (diff) | |
| download | wireguard-openbsd-7c07cf69a8de89e20765140a81741310e354dc74.tar.xz wireguard-openbsd-7c07cf69a8de89e20765140a81741310e354dc74.zip | |
Return error values directly where appropriate, instead of using the err
variable.
While there, remove TODO about bitching. We haven't felt the need to bitch
since the driver was commited, and we do not bitch in aesni_setup() either.
OK visa@
| -rw-r--r-- | sys/arch/amd64/amd64/via.c | 18 | ||||
| -rw-r--r-- | sys/arch/i386/i386/via.c | 18 |
2 files changed, 14 insertions, 22 deletions
diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index 284649cf675..f141272c77b 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.29 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: via.c,v 1.30 2018/05/31 20:19:05 fcambus Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -87,7 +87,7 @@ viac3_crypto_setup(void) vc3_sc = malloc(sizeof(*vc3_sc), M_DEVBUF, M_NOWAIT|M_ZERO); if (vc3_sc == NULL) - return; /* YYY bitch? */ + return; bzero(algs, sizeof(algs)); algs[CRYPTO_AES_CBC] = CRYPTO_ALG_FLAG_SUPPORTED; @@ -102,7 +102,7 @@ viac3_crypto_setup(void) vc3_sc->sc_cid = crypto_get_driverid(0); if (vc3_sc->sc_cid < 0) { free(vc3_sc, M_DEVBUF, sizeof(*vc3_sc)); - return; /* YYY bitch? */ + return; } crypto_register(vc3_sc->sc_cid, algs, viac3_crypto_newsession, @@ -340,16 +340,12 @@ viac3_crypto_encdec(struct cryptop *crp, struct cryptodesc *crd, u_int32_t *key; int err = 0; - if ((crd->crd_len % 16) != 0) { - err = EINVAL; - return (err); - } + if ((crd->crd_len % 16) != 0) + return (EINVAL); sc->op_buf = malloc(crd->crd_len, M_DEVBUF, M_NOWAIT); - if (sc->op_buf == NULL) { - err = ENOMEM; - return (err); - } + if (sc->op_buf == NULL) + return (ENOMEM); if (crd->crd_flags & CRD_F_ENCRYPT) { sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT; diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c index 827cd227812..bdea32fe6bc 100644 --- a/sys/arch/i386/i386/via.c +++ b/sys/arch/i386/i386/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.43 2018/04/28 15:44:59 jasper Exp $ */ +/* $OpenBSD: via.c,v 1.44 2018/05/31 20:19:05 fcambus Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -88,7 +88,7 @@ viac3_crypto_setup(void) vc3_sc = malloc(sizeof(*vc3_sc), M_DEVBUF, M_NOWAIT|M_ZERO); if (vc3_sc == NULL) - return; /* YYY bitch? */ + return; bzero(algs, sizeof(algs)); algs[CRYPTO_AES_CBC] = CRYPTO_ALG_FLAG_SUPPORTED; @@ -103,7 +103,7 @@ viac3_crypto_setup(void) vc3_sc->sc_cid = crypto_get_driverid(0); if (vc3_sc->sc_cid < 0) { free(vc3_sc, M_DEVBUF, sizeof(*vc3_sc)); - return; /* YYY bitch? */ + return; } crypto_register(vc3_sc->sc_cid, algs, viac3_crypto_newsession, @@ -341,16 +341,12 @@ viac3_crypto_encdec(struct cryptop *crp, struct cryptodesc *crd, u_int32_t *key; int err = 0; - if ((crd->crd_len % 16) != 0) { - err = EINVAL; - return (err); - } + if ((crd->crd_len % 16) != 0) + return (EINVAL); sc->op_buf = malloc(crd->crd_len, M_DEVBUF, M_NOWAIT); - if (sc->op_buf == NULL) { - err = ENOMEM; - return (err); - } + if (sc->op_buf == NULL) + return (ENOMEM); if (crd->crd_flags & CRD_F_ENCRYPT) { sc->op_cw[0] = ses->ses_cw0 | C3_CRYPT_CWLO_ENCRYPT; |