From owner-svn-src-head@freebsd.org Wed Apr 1 17:15:44 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C9B2F27A195; Wed, 1 Apr 2020 17:15:44 +0000 (UTC) (envelope-from jhb@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48stBR1zDDz3x5J; Wed, 1 Apr 2020 17:15:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F04CCEC9; Wed, 1 Apr 2020 17:09:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 031H9LxA041912; Wed, 1 Apr 2020 17:09:21 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 031H9LjL041911; Wed, 1 Apr 2020 17:09:21 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202004011709.031H9LjL041911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 1 Apr 2020 17:09:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359524 - head/sys/kgssapi/krb5 X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/kgssapi/krb5 X-SVN-Commit-Revision: 359524 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 17:15:45 -0000 Author: jhb Date: Wed Apr 1 17:09:21 2020 New Revision: 359524 URL: https://svnweb.freebsd.org/changeset/base/359524 Log: Set crp_ilen for crypto requests. Assertions in crypto_dispatch() depend on this value being set to verify that payload and AAD regions are in bounds. Also, requests that use a single kernel buffer rely on this to know how long the buffer is for bus_dma, etc. Reported by: kp Modified: head/sys/kgssapi/krb5/kcrypto_aes.c Modified: head/sys/kgssapi/krb5/kcrypto_aes.c ============================================================================== --- head/sys/kgssapi/krb5/kcrypto_aes.c Wed Apr 1 17:08:55 2020 (r359523) +++ head/sys/kgssapi/krb5/kcrypto_aes.c Wed Apr 1 17:09:21 2020 (r359524) @@ -158,6 +158,7 @@ aes_encrypt_1(const struct krb5_key_state *ks, int buf crp->crp_buf_type = buftype; crp->crp_buf = buf; + crp->crp_ilen = skip + len; crp->crp_opaque = as; crp->crp_callback = aes_crypto_cb; @@ -329,6 +330,7 @@ aes_checksum(const struct krb5_key_state *ks, int usag crp->crp_flags = CRYPTO_F_CBIFSYNC; crp->crp_buf_type = CRYPTO_BUF_MBUF; crp->crp_mbuf = inout; + crp->crp_ilen = skip + inlen + 12; crp->crp_opaque = as; crp->crp_callback = aes_crypto_cb;