Received: by 10.192.165.156 with SMTP id m28csp141764imm; Thu, 12 Apr 2018 18:32:28 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+d3cpicnq8qchVBuu5cwl7+TCnmFU7VYgFhS0d14nzotYSqiLN0q5p3FQQhCzurbCzcZEk X-Received: by 10.101.75.81 with SMTP id k17mr2489445pgt.335.1523583148121; Thu, 12 Apr 2018 18:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523583148; cv=none; d=google.com; s=arc-20160816; b=hl+LsnKMl1Ev4mZ11ewsyNLScMGHm86HA+F6yke8ED/CuUiY9j89s+2XdHq6GPt0uP HJM/7KksBW7vqPUz+stWaXXILDmMg3UXlAcJOfPgtK0y5TvdrpSBZ/oBYunOv0MXQe2g iFEgtU28eenvBQ2rR9KiAGkzHLG+a0mPaVS0gBegLZS5NkCgDYJNEJI5lraK8Vru66km WAl4S7e9rsj8PcaR9SBHVlPl/w+RyDw9O1pFMVx2E8eUcglXCxerrnQpgGPX7bIadbwu tksGGmoTwq0V2KQ6lyonrBd9B8u+2oSSwHAaXwQfMNHiTUF7I3124V0P3mhteieB5Ae7 hsaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=KnzwDQnPE7jznOkNEzTZ2ScWvgtOc6YCZrsnNKtkmvI=; b=ik1MY8ekvPpRfXALs41ogX/ta9eRSyjLsnvW4qXOW4BrOHe4JEEDKcmtapXFxqUYzZ YI01//gh6Z6/UTE15bCe3BMnhYC6f4bqG3bXNPdiZscbm1F3NNtrHOr/sfYstcVjteVQ IE4/jaRwztnQH0ZU4t1RWnxd8Gvm/jZ6073fAQgVsjjGEag7JdMhJ9fjeyW/nSnOSKfM JSOPk1z84r74S3G8UMs1O/Wy1I9UQkvuZzbJ3ewdFAFf972L/hDeGmpTl4B45EwmptU6 pwyKWpJXEEd6LJi40tQCfSpM4lsBS5BJ85yATPSBCxkYljjDmanTGreg68FWUbLCGg1v 4OVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@thunk.org header.s=ef5046eb header.b=eezuRVg9; 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 h82si3546264pfd.288.2018.04.12.18.32.14; Thu, 12 Apr 2018 18:32:28 -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=eezuRVg9; 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 S1753468AbeDMBbC (ORCPT + 99 others); Thu, 12 Apr 2018 21:31:02 -0400 Received: from imap.thunk.org ([74.207.234.97]:37194 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752037AbeDMBa6 (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=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=KnzwDQnPE7jznOkNEzTZ2ScWvgtOc6YCZrsnNKtkmvI=; b=eezuRVg90L7VjhwP8oRnV0LvfE oljvkCatOYq4gT6RGX++WabLFR7WzM1dEYnHJYyDgwIbhIKfi2xBSu0WqKR2p97ygVbXTj1Ufeude PGr3icXZbiwGrDO8j5/1Mvtv2/XPNRVkmliz1TlXcN+YCN901MSHbx2XYJRoJh8KAn7A=; Received: from root (helo=callcc.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.89) (envelope-from ) id 1f6nYG-0002dH-TP; Fri, 13 Apr 2018 01:30:56 +0000 Received: by callcc.thunk.org (Postfix, from userid 15806) id 658A97A2F44; 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 4/5] random: crng_reseed() should lock the crng instance that it is modifying Date: Thu, 12 Apr 2018 21:30:45 -0400 Message-Id: <20180413013046.404-4-tytso@mit.edu> X-Mailer: git-send-email 2.16.1.72.g5be1f00a9a In-Reply-To: <20180413013046.404-1-tytso@mit.edu> References: <20180413013046.404-1-tytso@mit.edu> 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 Reported-by: Jann Horn Fixes: 1e7f583af67b ("random: make /dev/urandom scalable for silly...") Cc: stable@kernel.org # 4.8+ Signed-off-by: Theodore Ts'o Reviewed-by: Jann Horn --- drivers/char/random.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 681ee0c0de24..6e7fa13b1a89 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -906,7 +906,7 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r) _crng_backtrack_protect(&primary_crng, buf.block, CHACHA20_KEY_SIZE); } - spin_lock_irqsave(&primary_crng.lock, flags); + spin_lock_irqsave(&crng->lock, flags); for (i = 0; i < 8; i++) { unsigned long rv; if (!arch_get_random_seed_long(&rv) && @@ -916,7 +916,7 @@ static void crng_reseed(struct crng_state *crng, struct entropy_store *r) } memzero_explicit(&buf, sizeof(buf)); crng->init_time = jiffies; - spin_unlock_irqrestore(&primary_crng.lock, flags); + spin_unlock_irqrestore(&crng->lock, flags); if (crng == &primary_crng && crng_init < 2) { invalidate_batched_entropy(); numa_crng_init(); -- 2.16.1.72.g5be1f00a9a