Attachment 234665 Details for Bug 252316 – Second jhb patch

[patch] Second jhb patch

freebsd-zfs-ocf-offload-jhb-2.diff (text/plain), 1.02 KB, created by Jeremy Faulkner on 2022-06-13 17:32:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Faulkner

Created: 2022-06-13 17:32:23 UTC

Size: 1.02 KB

patch

obsolete

>diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
>index 9bdbde36db3..56c7d73d4a8 100644
>--- a/sys/opencrypto/crypto.c
>+++ b/sys/opencrypto/crypto.c
>@@ -1378,7 +1378,7 @@ crp_sanity(struct cryptop *crp)
> 		    ("invalid payload output start"));
> 		if (csp->csp_mode == CSP_MODE_DIGEST)
> 		    KASSERT(crp->crp_payload_output_start == 0,
>-		        ("digest output payloads start at 0"));
>+		        ("output digest is not at offset 0"));
> 		else
> 		    KASSERT(crp->crp_payload_output_start +
> 		        crp->crp_payload_length <= olen,
>@@ -1386,9 +1386,11 @@ crp_sanity(struct cryptop *crp)
> 	}
> 	if (csp->csp_mode == CSP_MODE_DIGEST ||
> 	    csp->csp_mode == CSP_MODE_AEAD || csp->csp_mode == CSP_MODE_ETA) {
>-		if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST)
>+		if (crp->crp_op & CRYPTO_OP_VERIFY_DIGEST) {
> 			len = ilen;
>-		else
>+			KASSERT(olen == 0 && out == NULL,
>+			    ("invalid use of output buffer during verify operation"));
>+		} else
> 			len = olen;
> 		KASSERT(crp->crp_digest_start == 0 ||
> 		    crp->crp_digest_start < len,

Actions: View | Diff

Attachments on bug 252316: 221152 | 222488 | 234523 | 234528 | 234665 | 234740