Received: by 10.213.65.68 with SMTP id h4csp530593imn; Fri, 16 Mar 2018 10:32:36 -0700 (PDT) X-Google-Smtp-Source: AG47ELtBOY+ftUFzvDMzacSL5eMxfjDIFIJbMWYTE/RzmTHKk5dU/qdd6QmgMJRhCtBQb4MVleQN X-Received: by 2002:a17:902:aa91:: with SMTP id d17-v6mr3031920plr.145.1521221556396; Fri, 16 Mar 2018 10:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521221556; cv=none; d=google.com; s=arc-20160816; b=wlZZ6e2hK1Cd8jXKvxTLOG0CJ1IEidmG7i5gxRq4uvtwDC435NzGNELIkYlt5WVCym y/XWDL24sZmySoDNf8FIAKnQrXY6OKk2cqZG2ssPUduZIzIGf+QnGkQ80tOZOMLOlqam lWfkb5UebT54xXuSYGVn8SIU34a60j4mygsokC3k++N/k8rZAL8ScyBHvxFncWGaFShg AvajFa+I/6aWHYj+DvjNxMx3kc6WO8wYjPKI5ooVrpG6hMMg99NZ8trQZmqyJDmW6HA0 4IL49EtVuWC2kDBo5+cgC9a/DerzsTlDaDxpjdAzHvwJdTmNHxUjAT8YsiOu9Vafjc6d ni3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=4VHeFIFvwiB6rJJy8fQeTy2nEd0Vr2AYJ87pdBFblOk=; b=wfxT8YXOa9dDJBscYGIvDfYreCI1LOZEMfNGv6oitvzWAZYqKAQB/2m5xZIwv2ItyZ lChW4MCkzxybQiE9DJBDyHCO9Aq+7dZoma95B0V5vf0EE0yN5aRY7oG6K0MK2PCpGvms eKFoA6BMJ6fXHW2WgmQSC1nv8UZm77La4/WUM7e/lHnyAj5jhWx3ox9i/U4SmXnr3ACQ GHWcrWz9NV0NkIoe4runql/Oj//HF6w9gnDu15kvOySzXuvYoIwPocvIZUUzBTs67PRO +4QvSBlIAql8AhaChWPNVS7L04OKMNKq64VRxJmMKBDvK7Kre5GYMYwD2aubg63rqp+j hCCg== ARC-Authentication-Results: i=1; mx.google.com; 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 q7si5302413pgn.559.2018.03.16.10.32.22; Fri, 16 Mar 2018 10:32:36 -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; 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 S932685AbeCPP1r (ORCPT + 99 others); Fri, 16 Mar 2018 11:27:47 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34784 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754267AbeCPP1o (ORCPT ); Fri, 16 Mar 2018 11:27:44 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 1A0F8125B; Fri, 16 Mar 2018 15:27:37 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Borntraeger , Dan Williams , Andy Lutomirski , Arjan van de Ven , Borislav Petkov , Dave Hansen , David Woodhouse , Josh Poimboeuf , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Will Deacon , linux-arch@vger.kernel.org, Ingo Molnar Subject: [PATCH 4.4 26/63] nospec: Include dependency Date: Fri, 16 Mar 2018 16:22:58 +0100 Message-Id: <20180316152302.923159611@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152259.964532775@linuxfoundation.org> References: <20180316152259.964532775@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Williams commit eb6174f6d1be16b19cfa43dac296bfed003ce1a6 upstream. The nospec.h header expects the per-architecture header file to optionally define array_index_mask_nospec(). Include that dependency to prevent inadvertent fallback to the default array_index_mask_nospec() implementation. The default implementation may not provide a full mitigation on architectures that perform data value speculation. Reported-by: Christian Borntraeger Signed-off-by: Dan Williams Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Dave Hansen Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Will Deacon Cc: linux-arch@vger.kernel.org Link: http://lkml.kernel.org/r/151881605404.17395.1341935530792574707.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- include/linux/nospec.h | 1 + 1 file changed, 1 insertion(+) --- a/include/linux/nospec.h +++ b/include/linux/nospec.h @@ -5,6 +5,7 @@ #ifndef _LINUX_NOSPEC_H #define _LINUX_NOSPEC_H +#include /** * array_index_mask_nospec() - generate a ~0 mask when index < size, 0 otherwise