From nobody Thu Dec 30 01:50:47 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id A3A5A191B2F2; Thu, 30 Dec 2021 01:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JPWSl6qrgz4l3s; Thu, 30 Dec 2021 01:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B513D10384; Thu, 30 Dec 2021 01:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BU1olYd013283; Thu, 30 Dec 2021 01:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BU1olv0013282; Thu, 30 Dec 2021 01:50:47 GMT (envelope-from git) Date: Thu, 30 Dec 2021 01:50:47 GMT Message-Id: <202112300150.1BU1olv0013282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 61ff0a1f8145 - main - /dev/crypto: Store blocksize in cse rather than txform pointer. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61ff0a1f8145622a4db669715fc04e9358e643a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640829048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y4zhl+2cL1RkmWYF3T1/K+Ge5Un5XqNCYrf9QUIQEmo=; b=aD80iutzGLIrT9vJJ0LbnZGT9Y+ezxHwbekri0PLfojMMBXGCtTkjVjfLaUFJOkn08k25W a6ryo61uIt2zOQ7PzWAHtQGf+u2QNZy/rYE116BOEYiTGOcIb5Gf43zqCR3f7P3onGl4nt 2BDpwDW2DK6Z4g2zs1vivb6ioU00EpO0aCed7BBOcHCqRM4az/vtZ1q5/iSp2uzivzpsza Zxr7ZbBAFmVftV59Pv3yvxqG9FCKQD55rTwiFMpmVRgKFoMaCuzNegZtoHNDYbRfAUWpY/ Hf1WVSrKkuMuQX4OfPj689ZcKChQ2/troxeKXUfQdOCZe2DHC6voJKaMekLyQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640829048; a=rsa-sha256; cv=none; b=UYTQlNMX/0pddLs4gnqtL7r2JGgSM+F8wM7VUf2yYs8TISoMxoxQXuiOzqhZLW9RmZWGQY UWCn5yYxSFIwy2qOcSUdL0WeXAblopapWs4MK39hMmJcz1KjoyE6XG0FNPuhIeYCC93i40 ujH78bWrbeqbjRCy9hw0QUPU3oOMbNawvOUph0XgoatxZzJLxBsRI6FeHUG0yS18PqWVNi zOS+fZ2gH7vgHBqibSiZeUvI/4gpKX9F+erqh93dVpG2urDpobvw/TeV/GS/XXGgwra0a6 ap5x/QQDuuvhw1nICjbQAKnK7LHejxW0AWIjSYiQ07k6e7BWk9adxIfqMGzLEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=61ff0a1f8145622a4db669715fc04e9358e643a6 commit 61ff0a1f8145622a4db669715fc04e9358e643a6 Author: John Baldwin AuthorDate: 2021-12-30 01:50:23 +0000 Commit: John Baldwin CommitDate: 2021-12-30 01:50:23 +0000 /dev/crypto: Store blocksize in cse rather than txform pointer. Reviewed by: markj Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D33614 --- sys/opencrypto/cryptodev.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/sys/opencrypto/cryptodev.c b/sys/opencrypto/cryptodev.c index b8b727653847..a8c9f04e1fb7 100644 --- a/sys/opencrypto/cryptodev.c +++ b/sys/opencrypto/cryptodev.c @@ -269,7 +269,7 @@ struct csession { uint32_t ses; struct mtx lock; /* for op submission */ - const struct enc_xform *txform; + u_int blocksize; int hashsize; int ivsize; @@ -499,7 +499,6 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) cse->key = key; cse->mackey = mackey; cse->cses = cses; - cse->txform = txform; if (sop->maclen != 0) cse->hashsize = sop->maclen; else if (thash != NULL) @@ -508,6 +507,16 @@ cse_create(struct fcrypt *fcr, struct session2_op *sop) cse->hashsize = txform->macsize; cse->ivsize = csp.csp_ivlen; + /* + * NB: This isn't necessarily the block size of the underlying + * MAC or cipher but is instead a restriction on valid input + * sizes. + */ + if (txform != NULL) + cse->blocksize = txform->blocksize; + else + cse->blocksize = 1; + mtx_lock(&fcr->lock); TAILQ_INSERT_TAIL(&fcr->csessions, cse, next); cse->ses = fcr->sesn++; @@ -635,11 +644,9 @@ cryptodev_op(struct csession *cse, const struct crypt_op *cop) return (E2BIG); } - if (cse->txform) { - if ((cop->len % cse->txform->blocksize) != 0) { - SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__); - return (EINVAL); - } + if ((cop->len % cse->blocksize) != 0) { + SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__); + return (EINVAL); } if (cop->mac && cse->hashsize == 0) { @@ -866,8 +873,12 @@ cryptodev_aead(struct csession *cse, struct crypt_aead *caead) return (E2BIG); } - if (cse->txform == NULL || cse->hashsize == 0 || caead->tag == NULL || - (caead->len % cse->txform->blocksize) != 0) { + if ((caead->len % cse->blocksize) != 0) { + SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__); + return (EINVAL); + } + + if (cse->hashsize == 0 || caead->tag == NULL) { SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__); return (EINVAL); }