From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F11EFC433E0 for ; Wed, 5 Aug 2020 19:25:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C02ED206F6 for ; Wed, 5 Aug 2020 19:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596655536; bh=slR+AYmepWH5RbfuDWkszwUVsGqLY8LvH8mAxHRHiv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sB9N+N5YVfm2Fkfas0/8kOgLc1bE4ZHw8giNUvrB8L6VCCOnETx3iZO+y+Why6LFE SxwrHHu4opnjAps/oChEv25QUYG6Dqr+6LkNrccaLPXX8TwhBild+J6dlQoKw77Lsh xSycN/PCmQwPxTVnraN+fI3ve8sWwZ4k3gOm1QVs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728485AbgHETZ3 (ORCPT ); Wed, 5 Aug 2020 15:25:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:35570 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728735AbgHERPS (ORCPT ); Wed, 5 Aug 2020 13:15:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D0B562335A; Wed, 5 Aug 2020 15:52:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596642748; bh=slR+AYmepWH5RbfuDWkszwUVsGqLY8LvH8mAxHRHiv0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mj0NDPChwyrEulaChoWtzF5bFVNI2+Uo7vBI47fzF169MzjAagqloXaui9aaTKvnk gA+sJss054XVWgs/oTUYw+7KEayHYF1H2z3BArcNwZwod2BOVQ6MHMF7m5S50vC3lz jX0GHuxEykaMXiJSZnFZ3IQw+H59TE7R7gyyV3bo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Daniel=20D=C3=ADaz?= , Kees Cook , Marc Zyngier , Stephen Rothwell , Willy Tarreau , Linus Torvalds Subject: [PATCH 5.7 3/6] random: fix circular include dependency on arm64 after addition of percpu.h Date: Wed, 5 Aug 2020 17:52:30 +0200 Message-Id: <20200805153507.134935212@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200805153506.978105994@linuxfoundation.org> References: <20200805153506.978105994@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Willy Tarreau commit 1c9df907da83812e4f33b59d3d142c864d9da57f upstream. Daniel Díaz and Kees Cook independently reported that commit f227e3ec3b5c ("random32: update the net random state on interrupt and activity") broke arm64 due to a circular dependency on include files since the addition of percpu.h in random.h. The correct fix would definitely be to move all the prandom32 stuff out of random.h but for backporting, a smaller solution is preferred. This one replaces linux/percpu.h with asm/percpu.h, and this fixes the problem on x86_64, arm64, arm, and mips. Note that moving percpu.h around didn't change anything and that removing it entirely broke differently. When backporting, such options might still be considered if this patch fails to help. [ It turns out that an alternate fix seems to be to just remove the troublesome remove from the arm64 that causes the circular dependency. But we might as well do the whole belt-and-suspenders thing, and minimize inclusion in too. Either will fix the problem, and both are good changes. - Linus ] Reported-by: Daniel Díaz Reported-by: Kees Cook Tested-by: Marc Zyngier Fixes: f227e3ec3b5c Cc: Stephen Rothwell Signed-off-by: Willy Tarreau Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/linux/random.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/random.h +++ b/include/linux/random.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include