From patchwork Wed Apr 22 19:24:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Mueller X-Patchwork-Id: 6258211 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E73709F1BE for ; Wed, 22 Apr 2015 19:29:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D30E20320 for ; Wed, 22 Apr 2015 19:29:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 301BB2035E for ; Wed, 22 Apr 2015 19:29:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750930AbbDVT1m (ORCPT ); Wed, 22 Apr 2015 15:27:42 -0400 Received: from mail.eperm.de ([89.247.134.16]:34259 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbbDVT1k (ORCPT ); Wed, 22 Apr 2015 15:27:40 -0400 Received: from myon.chronox.de (unknown [172.56.16.74]) by mail.eperm.de (Postfix) with ESMTPSA id 29A582A0044; Wed, 22 Apr 2015 21:27:38 +0200 (CEST) From: Stephan Mueller To: herbert@gondor.apana.org.au Cc: Andreas Steffen , Theodore Ts'o , Sandy Harris , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/6] crypto: drbg - add async seeding operation Date: Wed, 22 Apr 2015 21:24:07 +0200 Message-ID: <9795146.aMrfnC05Xd@myon.chronox.de> User-Agent: KMail/4.14.6 (Linux/3.19.3-200.fc21.x86_64; KDE/4.14.6; x86_64; ; ) In-Reply-To: <5054521.el7mZro33c@myon.chronox.de> References: <5054521.el7mZro33c@myon.chronox.de> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The async seeding operation is triggered during initalization right after the first non-blocking seeding is completed. As required by the asynchronous operation of random.c, a callback function is provided that is triggered by random.c once entropy is available. That callback function performs the actual seeding of the DRBG. CC: Andreas Steffen CC: Theodore Ts'o CC: Sandy Harris Signed-off-by: Stephan Mueller --- crypto/drbg.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ include/crypto/drbg.h | 1 + 2 files changed, 47 insertions(+) diff --git a/crypto/drbg.c b/crypto/drbg.c index 906b6e5..cdc23c8 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1056,6 +1056,40 @@ static inline int __drbg_seed(struct drbg_state *drbg, struct list_head *seed, return ret; } +/* DRBG callback for obtaining data from the async Linux RNG */ +static void drbg_async_seed_cb(void *buf, ssize_t buflen, void *private) +{ + struct drbg_string data; + LIST_HEAD(seedlist); + struct drbg_state *drbg = (struct drbg_state *)private; + int ret = 0; + + if (buflen <= 0 || !buf) + return; + + drbg_string_fill(&data, buf, buflen); + list_add_tail(&data.list, &seedlist); + /* sanity check to verify that there is still a DRBG instance */ + if (!drbg) + return; + mutex_lock(&drbg->drbg_mutex); + /* sanity check to verify that the DRBG instance is valid */ + if (!drbg->V) { + mutex_unlock(&drbg->drbg_mutex); + return; + } + ret = __drbg_seed(drbg, &seedlist, true); + memzero_explicit(buf, buflen); + mutex_unlock(&drbg->drbg_mutex); +} + +/* Cancel any outstanding async operation and wait for their completion */ +static inline void drbg_async_work_cancel(struct random_work *work) +{ + get_blocking_random_bytes_cancel(work); + cancel_work_sync(&work->rw_work); +} + /* * Seeding or reseeding of the DRBG * @@ -1081,6 +1115,11 @@ static int drbg_seed(struct drbg_state *drbg, struct drbg_string *pers, return -EINVAL; } + /* cancel any previously invoked seeding */ + mutex_unlock(&drbg->drbg_mutex); + drbg_async_work_cancel(&drbg->seed_work); + mutex_lock(&drbg->drbg_mutex); + if (list_empty(&drbg->test_data.list)) { drbg_string_fill(&data1, drbg->test_data.buf, drbg->test_data.len); @@ -1125,6 +1164,12 @@ static int drbg_seed(struct drbg_state *drbg, struct drbg_string *pers, if (!reseed) drbg->seed_buf_len = drbg->seed_buf_len / 3 * 2; + /* Invoke asynchronous seeding unless DRBG is in test mode. */ + if (!list_empty(&drbg->test_data.list)) + get_blocking_random_bytes_cb(NULL, &drbg->seed_work, + drbg->seed_buf, drbg->seed_buf_len, + drbg, drbg_async_seed_cb); + out: return ret; } @@ -1487,6 +1532,7 @@ unlock: */ static int drbg_uninstantiate(struct drbg_state *drbg) { + drbg_async_work_cancel(&drbg->seed_work); if (drbg->d_ops) drbg->d_ops->crypto_fini(drbg); drbg_dealloc_state(drbg); diff --git a/include/crypto/drbg.h b/include/crypto/drbg.h index b052698..e4980a1 100644 --- a/include/crypto/drbg.h +++ b/include/crypto/drbg.h @@ -119,6 +119,7 @@ struct drbg_state { bool fips_primed; /* Continuous test primed? */ unsigned char *prev; /* FIPS 140-2 continuous test value */ #endif + struct random_work seed_work; /* asynchronous seeding support */ u8 *seed_buf; /* buffer holding the seed */ size_t seed_buf_len; const struct drbg_state_ops *d_ops;