Received: by 10.192.165.156 with SMTP id m28csp142630imm; Thu, 12 Apr 2018 18:33:51 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+gc3dm1t8MpudTLpUHyV8CdRVUsOU8EXzZOjd4fbz1Tud4q2/CAkL+IyfR3UONyMz4aTHX X-Received: by 10.99.116.17 with SMTP id p17mr2481711pgc.43.1523583230950; Thu, 12 Apr 2018 18:33:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523583230; cv=none; d=google.com; s=arc-20160816; b=Ey/vYvxvuZblO2FjZ/740Y7EH82H/B+Tx2OP+9rkuBo8g8bTf6FonSZgATvnYBFo32 n0nODmCkvubdl7o4pgOsWT32qa6XbJ099Hs9arEzYn/oitS6DOqmzvBg+otnP+39wN8W nnNF153JqtGIIkEaqh5hm/ZKs/hmCW6s2ys11A/X8vj5OSgQdEZ3dnJt/dACTtjJDrB9 QDv1/1BA3pYK4b9nVBem+4bwJtEqXyqUuIvyxjSLY+K8iHw1Tc/j8p0Sb3T/c1xUGYUC GlYbC1z7VFLV687a+aTGeMCjRhhFVN/nTKk5QQbAcbNW6s62fWg3q+Np6gHjOWN1zeaY 5BqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=cQA8308xd5bS2xQjq5l5B4krATR07QVbpqAaqt10Rl8=; b=LBeb2OmSB2g3OeIlIez3VvgBhwl+I0OZW7H4M8oriQpY1xiwaP3yq9ZlTdZh5iMr8a RMuEwmrfoVtmXAcK249vNBAjyaGRklL46ImVPiKDflLHssm6ZH594kspvlAGnfFp+4ph 37PEg5feDW377MZE+vPC1xIId09d3JIKP6937KGrkku28xK0xoNOL4SyFsqZnKlfsBaU pCHcsfPDjy6RNTtmVitIJVN+9BB+0/6hQH+yqhELXxpFURFPC18afnZxPxC3/o4oh+7k +HpUM6PlSKn1oAwjTFsVCXLVmNzo5A9I6wSXU7aDpATHsc5Dm0vZLMAfznWyUDpGjuai 3sMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@thunk.org header.s=ef5046eb header.b=YaCDTzXa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2si3061988pgq.646.2018.04.12.18.33.37; Thu, 12 Apr 2018 18:33:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@thunk.org header.s=ef5046eb header.b=YaCDTzXa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753693AbeDMBbv (ORCPT + 99 others); Thu, 12 Apr 2018 21:31:51 -0400 Received: from imap.thunk.org ([74.207.234.97]:37196 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752298AbeDMBa6 (ORCPT ); Thu, 12 Apr 2018 21:30:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=thunk.org; s=ef5046eb; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cQA8308xd5bS2xQjq5l5B4krATR07QVbpqAaqt10Rl8=; b=YaCDTzXakstAvcJpxzX59pOAws uJTlWGGkpvSWGJYpQD+AAbdvEW4aAvGSQdbd6KEfXEMzUO4z7cZkLIkQhZW0IHKCC5WZ1MPsfqhhw uGumv5DR95ZmFJBf4vqzuRnnXwxegrpHJUsN1SJ0Sn4vG4am0VjPi0G3e/b7h8dQ3PW4=; Received: from root (helo=callcc.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.89) (envelope-from ) id 1f6nYG-0002co-Bl; Fri, 13 Apr 2018 01:30:56 +0000 Received: by callcc.thunk.org (Postfix, from userid 15806) id 546E27A2DF0; Thu, 12 Apr 2018 21:30:55 -0400 (EDT) From: Theodore Ts'o To: linux-crypto@vger.kernel.org Cc: Linux Kernel Developers List , Theodore Ts'o , stable@kernel.org Subject: [PATCH 1/5] random: fix crng_ready() test Date: Thu, 12 Apr 2018 21:30:42 -0400 Message-Id: <20180413013046.404-1-tytso@mit.edu> X-Mailer: git-send-email 2.16.1.72.g5be1f00a9a X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The crng_init variable has three states: 0: The CRNG is not initialized at all 1: The CRNG has a small amount of entropy, hopefully good enough for early-boot, non-cryptographical use cases 2: The CRNG is fully initialized and we are sure it is safe for cryptographic use cases. The crng_ready() function should only return true once we are in the last state. Reported-by: Jann Horn Fixes: e192be9d9a30 ("random: replace non-blocking pool...") Cc: stable@kernel.org # 4.8+ Signed-off-by: Theodore Ts'o Reviewed-by: Jann Horn --- drivers/char/random.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index e027e7fa1472..c8ec1e70abde 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -427,7 +427,7 @@ struct crng_state primary_crng = { * its value (from 0->1->2). */ static int crng_init = 0; -#define crng_ready() (likely(crng_init > 0)) +#define crng_ready() (likely(crng_init > 1)) static int crng_init_cnt = 0; #define CRNG_INIT_CNT_THRESH (2*CHACHA20_KEY_SIZE) static void _extract_crng(struct crng_state *crng, @@ -794,7 +794,7 @@ static int crng_fast_load(const char *cp, size_t len) if (!spin_trylock_irqsave(&primary_crng.lock, flags)) return 0; - if (crng_ready()) { + if (crng_init != 0) { spin_unlock_irqrestore(&primary_crng.lock, flags); return 0; } @@ -856,7 +856,7 @@ static void _extract_crng(struct crng_state *crng, { unsigned long v, flags; - if (crng_init > 1 && + if (crng_ready() && time_after(jiffies, crng->init_time + CRNG_RESEED_INTERVAL)) crng_reseed(crng, crng == &primary_crng ? &input_pool : NULL); spin_lock_irqsave(&crng->lock, flags); @@ -1139,7 +1139,7 @@ void add_interrupt_randomness(int irq, int irq_flags) fast_mix(fast_pool); add_interrupt_bench(cycles); - if (!crng_ready()) { + if (unlikely(crng_init == 0)) { if ((fast_pool->count >= 64) && crng_fast_load((char *) fast_pool->pool, sizeof(fast_pool->pool))) { @@ -2212,7 +2212,7 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, { struct entropy_store *poolp = &input_pool; - if (!crng_ready()) { + if (unlikely(crng_init == 0)) { crng_fast_load(buffer, count); return; } -- 2.16.1.72.g5be1f00a9a