From owner-p4-projects@FreeBSD.ORG  Sun Dec 10 22:58:20 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF68616A4FC; Sun, 10 Dec 2006 22:58:19 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id CD06316A4D8
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 22:58:19 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E030743C9D
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 22:57:06 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kBAMwJvP063108
	for <perforce@freebsd.org>; Sun, 10 Dec 2006 22:58:19 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBAMwJoo063105
	for perforce@freebsd.org; Sun, 10 Dec 2006 22:58:19 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 10 Dec 2006 22:58:19 GMT
Message-Id: <200612102258.kBAMwJoo063105@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111408 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Dec 2006 22:58:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=111408

Change 111408 by sam@sam_ebb on 2006/12/10 22:57:32

	guard against crypto_dispatch returning an error
	when re-submitted a symmetric op in the callback
	routine; previously we assumed it always worked

Affected files ...

.. //depot/projects/crypto/sys/opencrypto/cryptodev.c#8 edit

Differences ...

==== //depot/projects/crypto/sys/opencrypto/cryptodev.c#8 (text+ko) ====

@@ -526,12 +526,16 @@
 {
 	struct cryptop *crp = (struct cryptop *) op;
 	struct csession *cse = (struct csession *)crp->crp_opaque;
+	int error;
 
-	cse->error = crp->crp_etype;
-	if (crp->crp_etype == EAGAIN)
-		return crypto_dispatch(crp);
+	error = crp->crp_etype;
+	if (error == EAGAIN)
+		error = crypto_dispatch(crp);
 	mtx_lock(&cse->lock);
-	wakeup_one(crp);
+	if (error != 0 || (crp->crp_flags & CRYPTO_F_DONE)) {
+		cse->error = error;
+		wakeup_one(crp);
+	}
 	mtx_unlock(&cse->lock);
 	return (0);
 }