From owner-svn-src-head@freebsd.org Wed Apr 15 21:05:39 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 0A8142C27DC; Wed, 15 Apr 2020 21:05:39 +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 492ZdG6XWYz4Qvm; Wed, 15 Apr 2020 21:05:38 +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 DBB3B2540D; Wed, 15 Apr 2020 21:05:38 +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 03FL5cxD021566; Wed, 15 Apr 2020 21:05:38 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03FL5cYx021565; Wed, 15 Apr 2020 21:05:38 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202004152105.03FL5cYx021565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 15 Apr 2020 21:05:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359993 - head/sys/crypto/via X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/crypto/via X-SVN-Commit-Revision: 359993 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, 15 Apr 2020 21:05:39 -0000 Author: jhb Date: Wed Apr 15 21:05:38 2020 New Revision: 359993 URL: https://svnweb.freebsd.org/changeset/base/359993 Log: Use crypto_contiguous_subsegment(). This driver used a home-rolled version that predated the function and didn't support mbufs. Modified: head/sys/crypto/via/padlock_cipher.c Modified: head/sys/crypto/via/padlock_cipher.c ============================================================================== --- head/sys/crypto/via/padlock_cipher.c Wed Apr 15 20:33:09 2020 (r359992) +++ head/sys/crypto/via/padlock_cipher.c Wed Apr 15 21:05:38 2020 (r359993) @@ -169,27 +169,9 @@ padlock_cipher_alloc(struct cryptop *crp, int *allocat { u_char *addr; - switch (crp->crp_buf_type) { - case CRYPTO_BUF_MBUF: - break; - case CRYPTO_BUF_UIO: { - struct uio *uio; - struct iovec *iov; - - uio = crp->crp_uio; - if (uio->uio_iovcnt != 1) - break; - iov = uio->uio_iov; - addr = (u_char *)iov->iov_base + crp->crp_payload_start; - if (((uintptr_t)addr & 0xf) != 0) /* 16 bytes aligned? */ - break; - *allocated = 0; - return (addr); - } - case CRYPTO_BUF_CONTIG: - addr = (u_char *)crp->crp_buf + crp->crp_payload_start; - if (((uintptr_t)addr & 0xf) != 0) /* 16 bytes aligned? */ - break; + addr = crypto_contiguous_subsegment(crp, crp->crp_payload_start, + crp->crp_payload_length); + if (((uintptr_t)addr & 0xf) == 0) { /* 16 bytes aligned? */ *allocated = 0; return (addr); }