From owner-svn-src-head@freebsd.org  Mon Jan  8 13:43:14 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 043FAE6D627;
 Mon,  8 Jan 2018 13:43:14 +0000 (UTC)
 (envelope-from fabient@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D38527BE84;
 Mon,  8 Jan 2018 13:43:13 +0000 (UTC)
 (envelope-from fabient@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 1D1EF69D;
 Mon,  8 Jan 2018 13:43:13 +0000 (UTC)
 (envelope-from fabient@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w08DhC2u094278;
 Mon, 8 Jan 2018 13:43:12 GMT (envelope-from fabient@FreeBSD.org)
Received: (from fabient@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w08DhCjV094277;
 Mon, 8 Jan 2018 13:43:12 GMT (envelope-from fabient@FreeBSD.org)
Message-Id: <201801081343.w08DhCjV094277@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: fabient set sender to
 fabient@FreeBSD.org using -f
From: Fabien Thomas <fabient@FreeBSD.org>
Date: Mon, 8 Jan 2018 13:43:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327696 - head/sys/opencrypto
X-SVN-Group: head
X-SVN-Commit-Author: fabient
X-SVN-Commit-Paths: head/sys/opencrypto
X-SVN-Commit-Revision: 327696
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.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jan 2018 13:43:14 -0000

Author: fabient
Date: Mon Jan  8 13:43:12 2018
New Revision: 327696
URL: https://svnweb.freebsd.org/changeset/base/327696

Log:
  Fix uninitialized crp_retw_id when using asynchronous crypto drivers
  with defered callbacks.
  
  Submitted by:	emeric.poupon@stormshield.eu
  Reported by:	mav@
  Reviewed by:	fabient@

Modified:
  head/sys/opencrypto/crypto.c

Modified: head/sys/opencrypto/crypto.c
==============================================================================
--- head/sys/opencrypto/crypto.c	Mon Jan  8 13:19:15 2018	(r327695)
+++ head/sys/opencrypto/crypto.c	Mon Jan  8 13:43:12 2018	(r327696)
@@ -896,11 +896,12 @@ crypto_dispatch(struct cryptop *crp)
 		binuptime(&crp->crp_tstamp);
 #endif
 
+	crp->crp_retw_id = crp->crp_sid % crypto_workers_num;
+
 	if (CRYPTOP_ASYNC(crp)) {
 		if (crp->crp_flags & CRYPTO_F_ASYNC_KEEPORDER) {
 			struct crypto_ret_worker *ret_worker;
 
-			crp->crp_retw_id = crp->crp_sid % crypto_workers_num;
 			ret_worker = CRYPTO_RETW(crp->crp_retw_id);
 
 			CRYPTO_RETW_LOCK(ret_worker);