From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224d6sKKDXcW1omfQEiEh9fEs2AMrgBxISVUOvuMAp+NzebEsESypky15ZzjLQicf2H9zsDO ARC-Seal: i=1; a=rsa-sha256; t=1517855041; cv=none; d=google.com; s=arc-20160816; b=Lbeigp6pUEV3egdOO8nHPpSuNU949j0uMZU2eUNSMUve8EEnFXkDtLA3cgh4o49Bg0 N/L+Bn6+eF/n1mJIDUlkY/92QEqq/go1rMYk66AZxETXEflk0TxctOdH0+66p6+bf8Z8 Pj9jkvwzvMsiTsIaeQZixUnLIvJBI2rpfrXEQIst38Dcux4zli7AbefcAlHTD8tqm9HB uD49qNJdLF0EYG7LruqUbHcjn0huRRmnXcfat1Qb/xToFGjRMow9SWUXACRMDozbJlrs 5iQFvgS7djltZZWxrFIEsRUmbVl2z+2xRfRBfS3I8cY/UEuFZoyQ4v8nj9WorEyqUrZF RuMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=6Ute/cXyzOGvFlCfltv0bLuNKs+Vd4lAVeK1lLdob0s=; b=sJumxl5/edlXwQFd2HMNzScqyxCZDqGmFmjl2yeSx3akWT/7gZfAVKUo+cyGM8KSXd XUEk8CTKr+r0KP3V0gqFEv8DwLSjO0iUDV0voXzTd53S7lpO/XnPGs9qI3ne5nO1roCS ssBZ+nhh99UbDKaxvbrvTYRADo5836KT7dMqu14//UdaiktgRAD6D9jCMq51FTXg5nuN z+n2DzoHNq0noFPiPh7kJ8cD5aBAMWh2eByddL8BQxamceHlfuUSLrlxA51+QRmzrpbF lLZAmdxZYHb9Z/Ah/5wg1sZSk0DimReeiS6Yky0KDiIiccSwEigVLvR8SczikCOZtsBu M9Sg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 104.132.1.108 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 104.132.1.108 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Peter Zijlstra (Intel)" , Thomas Gleixner , David Woodhouse , Andrea Arcangeli , Andi Kleen , Ashok Raj , Jun Nakajima , David Woodhouse , Linus Torvalds , rga@amazon.de, Dave Hansen , Asit Mallick , Andy Lutomirski , Josh Poimboeuf , Jason Baron , Paolo Bonzini , Dan Williams , Arjan Van De Ven , Tim Chen Subject: [PATCH 4.14 05/64] KVM: x86: Make indirect calls in emulator speculation safe Date: Mon, 5 Feb 2018 10:22:24 -0800 Message-Id: <20180205182138.793954774@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180205182138.571333346@linuxfoundation.org> References: <20180205182138.571333346@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1591586367842666106?= X-GMAIL-MSGID: =?utf-8?q?1591586367842666106?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Zijlstra peterz@infradead.org commit 1a29b5b7f347a1a9230c1e0af5b37e3e571588ab Replace the indirect calls with CALL_NOSPEC. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner Reviewed-by: David Woodhouse Cc: Andrea Arcangeli Cc: Andi Kleen Cc: Ashok Raj Cc: Greg KH Cc: Jun Nakajima Cc: David Woodhouse Cc: Linus Torvalds Cc: rga@amazon.de Cc: Dave Hansen Cc: Asit Mallick Cc: Andy Lutomirski Cc: Josh Poimboeuf Cc: Jason Baron Cc: Paolo Bonzini Cc: Dan Williams Cc: Arjan Van De Ven Cc: Tim Chen Link: https://lkml.kernel.org/r/20180125095843.595615683@infradead.org Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/emulate.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "x86.h" #include "tss.h" @@ -1021,8 +1022,8 @@ static __always_inline u8 test_cc(unsign void (*fop)(void) = (void *)em_setcc + 4 * (condition & 0xf); flags = (flags & EFLAGS_MASK) | X86_EFLAGS_IF; - asm("push %[flags]; popf; call *%[fastop]" - : "=a"(rc) : [fastop]"r"(fop), [flags]"r"(flags)); + asm("push %[flags]; popf; " CALL_NOSPEC + : "=a"(rc) : [thunk_target]"r"(fop), [flags]"r"(flags)); return rc; } @@ -5350,9 +5351,9 @@ static int fastop(struct x86_emulate_ctx if (!(ctxt->d & ByteOp)) fop += __ffs(ctxt->dst.bytes) * FASTOP_SIZE; - asm("push %[flags]; popf; call *%[fastop]; pushf; pop %[flags]\n" + asm("push %[flags]; popf; " CALL_NOSPEC " ; pushf; pop %[flags]\n" : "+a"(ctxt->dst.val), "+d"(ctxt->src.val), [flags]"+D"(flags), - [fastop]"+S"(fop), ASM_CALL_CONSTRAINT + [thunk_target]"+S"(fop), ASM_CALL_CONSTRAINT : "c"(ctxt->src2.val)); ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK);