From patchwork Mon May 30 05:39:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 9140257 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5EA7B60759 for ; Mon, 30 May 2016 05:41:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 542D428210 for ; Mon, 30 May 2016 05:41:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48CA828213; Mon, 30 May 2016 05:41:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED16B28210 for ; Mon, 30 May 2016 05:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932114AbcE3Flf (ORCPT ); Mon, 30 May 2016 01:41:35 -0400 Received: from imap.thunk.org ([74.207.234.97]:45512 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161049AbcE3FkN (ORCPT ); Mon, 30 May 2016 01:40:13 -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; bh=JRgTNXsjdeME3P3jqsWmZPzLBmc2FgcX9Sj/P6O6/hI=; b=jDGz/zgrJYZBQza7YOWC5mMvNvsRgOdmXQDdF2++ZkQPsBU81mVsCSUrR6JUDLSxJ7xQqQJBQa5yDdflsU/xwPviOHaB3fVtiOShz/NewtfXpIvw+n+Sb5GQztDvQ9V7wLKYFlv8gDp+FrKBcs26uCCpN/kYzCyLRHeZlLaXPpA=; Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.84_2) (envelope-from ) id 1b7Fvk-0003X8-Kd; Mon, 30 May 2016 05:40:00 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id 3696A82EBC1; Mon, 30 May 2016 01:39:59 -0400 (EDT) From: Theodore Ts'o To: Linux Kernel Developers List Cc: smueller@chronox.de, herbert@gondor.apana.org.au, andi@firstfloor.org, sandyinchina@gmail.com, cryptography@lakedaemon.net, jsd@av8n.com, hpa@zytor.com, linux-crypto@vger.kernel.org, Eric Biggers , Theodore Ts'o Subject: [PATCH 5/5] random: properly align get_random_int_hash Date: Mon, 30 May 2016 01:39:25 -0400 Message-Id: <1464586765-14436-6-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464586765-14436-1-git-send-email-tytso@mit.edu> References: <1464586765-14436-1-git-send-email-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-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers get_random_long() reads from the get_random_int_hash array using an unsigned long pointer. For this code to be guaranteed correct on all architectures, the array must be aligned to an unsigned long boundary. Signed-off-by: Eric Biggers Signed-off-by: Theodore Ts'o --- drivers/char/random.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index 860862f..90fb569 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -2033,13 +2033,15 @@ int random_int_secret_init(void) return 0; } +static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash) + __aligned(sizeof(unsigned long)); + /* * Get a random word for internal kernel use only. Similar to urandom but * with the goal of minimal entropy pool depletion. As a result, the random * value is not cryptographically secure but for several uses the cost of * depleting entropy is too high */ -static DEFINE_PER_CPU(__u32 [MD5_DIGEST_WORDS], get_random_int_hash); unsigned int get_random_int(void) { __u32 *hash;