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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 59FCDC43381 for ; Mon, 18 Feb 2019 14:02:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C6B921901 for ; Mon, 18 Feb 2019 14:02:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498558; bh=oQ7kr3e6Rh5pMp2IYnMOS/3zltkcsQMY125VegaJrC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uHwap5RuWF7Xvq4v+nzlaUTRlLexINhsywkuZEZeQSRlmP46Ruh5a43ZQp1Pxt8fa TPIf9rMh3U2XTBcuK3d0SvNbFbv8aaRRpUTvExzGglxmorHRmkUVY1hxu37SyvN+Jd Y6Us6YqHBKnKakZqySo0fVzsbN86FBEToicik/8c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389441AbfBROCg (ORCPT ); Mon, 18 Feb 2019 09:02:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:44354 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388533AbfBROCd (ORCPT ); Mon, 18 Feb 2019 09:02:33 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 9CD082173C; Mon, 18 Feb 2019 14:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498553; bh=oQ7kr3e6Rh5pMp2IYnMOS/3zltkcsQMY125VegaJrC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQYtQP+b2IeqMGl/HkVC+LUxqiMtLzrS1lWAEYDqIilmgGRULNSHpvMJCjHWiRaKw mE436j8yhjmOTSWSUphxgjaXl0PHyekg6Zgl+0IPIKMn05V6xw9NeyQRWLBYT9izYU Xp5wrqSeDby6kaODj8I8m1uVqPL0q8GZMP62dxeM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sebastian Andrzej Siewior , Borislav Petkov , Rik van Riel , "H. Peter Anvin" , "Jason A. Donenfeld" , Andy Lutomirski , Dave Hansen , Ingo Molnar , Jann Horn , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Thomas Gleixner , kvm ML , x86-ml , Sasha Levin Subject: [PATCH 4.4 023/143] x86/fpu: Add might_fault() to user_insn() Date: Mon, 18 Feb 2019 14:42:31 +0100 Message-Id: <20190218133530.001821501@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. ------------------ [ Upstream commit 6637401c35b2f327a35d27f44bda05e327f2f017 ] Every user of user_insn() passes an user memory pointer to this macro. Add might_fault() to user_insn() so we can spot users which are using this macro in sections where page faulting is not allowed. [ bp: Space it out to make it more visible. ] Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Borislav Petkov Reviewed-by: Rik van Riel Cc: "H. Peter Anvin" Cc: "Jason A. Donenfeld" Cc: Andy Lutomirski Cc: Dave Hansen Cc: Ingo Molnar Cc: Jann Horn Cc: Paolo Bonzini Cc: Radim Krčmář Cc: Thomas Gleixner Cc: kvm ML Cc: x86-ml Link: https://lkml.kernel.org/r/20181128222035.2996-6-bigeasy@linutronix.de Signed-off-by: Sasha Levin --- arch/x86/include/asm/fpu/internal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index 16825dda18dc..66a5e60f60c4 100644 --- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -94,6 +94,9 @@ extern void fpstate_sanitize_xstate(struct fpu *fpu); #define user_insn(insn, output, input...) \ ({ \ int err; \ + \ + might_fault(); \ + \ asm volatile(ASM_STAC "\n" \ "1:" #insn "\n\t" \ "2: " ASM_CLAC "\n" \ -- 2.19.1