Skip to content

wg(4): Check for crypto operation errors #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fichtner merged 2 commits into from
Aug 3, 2026
+25 −1
Merged

wg(4): Check for crypto operation errors #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
decc56e
wg(4): Check for crypto operation errors
bsdjhb Jul 27, 2026
b181583
OCF: Add a fail point to inject EBADMSG decryption errors
bsdjhb Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion sys/dev/wg/wg_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ chacha20poly1305_encrypt_mbuf(struct mbuf *m, const uint64_t nonce,
crp.crp_cipher_key = key;
crp.crp_callback = crypto_callback;
ret = crypto_dispatch(&crp);
if (ret == 0)
ret = crp.crp_etype;
crypto_destroyreq(&crp);
return (ret);
}
Expand All @@ -253,6 +255,8 @@ chacha20poly1305_decrypt_mbuf(struct mbuf *m, const uint64_t nonce,
crp.crp_cipher_key = key;
crp.crp_callback = crypto_callback;
ret = crypto_dispatch(&crp);
if (ret == 0)
ret = crp.crp_etype;
crypto_destroyreq(&crp);
if (ret)
return (ret);
Expand All @@ -270,9 +274,14 @@ crypto_init(void)
.csp_cipher_klen = CHACHA20POLY1305_KEY_SIZE,
.csp_flags = CSP_F_SEPARATE_AAD | CSP_F_SEPARATE_OUTPUT
};
int ret = crypto_newsession(&chacha20_poly1305_sid, &csp, CRYPTOCAP_F_SOFTWARE);
int ret = crypto_newsession(&chacha20_poly1305_sid, &csp,
CRYPTOCAP_F_SOFTWARE);
if (ret != 0)
return (ret);
if (!CRYPTO_SESS_SYNC(chacha20_poly1305_sid)) {
crypto_freesession(chacha20_poly1305_sid);
return (ENXIO);
}
return (0);
}

Expand Down
15 changes: 15 additions & 0 deletions sys/opencrypto/crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/counter.h>
#include <sys/fail.h>
#include <sys/kernel.h>
#include <sys/kthread.h>
#include <sys/linker.h>
Expand Down Expand Up @@ -145,6 +146,9 @@ static struct mtx crypto_q_mtx;
SYSCTL_NODE(_kern, OID_AUTO, crypto, CTLFLAG_RW, 0,
"In-kernel cryptography");

static SYSCTL_NODE(_debug_fail_point, OID_AUTO, crypto, CTLFLAG_RW, 0,
"OCF fail points");

/*
* Taskqueue used to dispatch the crypto requests submitted with
* crypto_dispatch_async .
Expand Down Expand Up @@ -1666,6 +1670,17 @@ crypto_clonereq(struct cryptop *crp, crypto_session_t cses, int how)
void
crypto_done(struct cryptop *crp)
{
if (crp->crp_etype == 0) {
switch (crp->crp_session->csp.csp_mode) {
case CSP_MODE_DIGEST:
case CSP_MODE_AEAD:
if ((crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) != 0)
KFAIL_POINT_CODE(_debug_fail_point_crypto,
inject_badmsg, crp->crp_etype = EBADMSG);
break;
}
}

if (crp->crp_etype != 0)
CRYPTOSTAT_INC(cs_errs);

Expand Down