From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224wSHiBs2ewJdvFCgDO5pylCA/XRH+rrSnCY1h2LXRIBC4B+RdHmJeSiafARAo00ilrLK6g ARC-Seal: i=1; a=rsa-sha256; t=1516611250; cv=none; d=google.com; s=arc-20160816; b=H/rGOiwI06LaCeDY9rlXH8AfzgHcUIhwk2oZ+le4yyGdz+s84o8s85QUIfGXYOhlVT jjIEGp4SsjoTOzxP+ELBjX9D8kEHirdG1erkhTnf/gmzPWO5QJDWE/Znm9DPhh6BmbdN BCTmCLKldaJfWIAqmnytUynTukhSjYgWnhHoi2EXtZ062ZdLHKWp88Z4WldeCOTiz3zr Y3789PcYPrM62SjAWSQJLMyHKi/pQVCvwd9hIAEb2aKArA6UwP/QN6y49rdQ5Dy7y3ZM JxS3bEMW0vFKBkqrhTC3b/yHT16MKtIvZLA10+EUzBXRmeXTTnEpmhySAR/MVWURNZAm 6mJA== 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=Gd1u0J7kIhAXMwtSMBs5jCG1SdiLyFNlDoQkaRwaOSE=; b=vJl2zUF56oiNsfwMH45lkFzUSEawsp/cUflNdjvOwj4iGsbwUfixH6mskORyepr1zp 9gyBq3Bgf8Ip7bO9DeieeW0Qu6tdF5XZJF3H0OALjnSdWA/25tsdqJuFCn+BMJUQtPOz xQBf6vhwQRo+Qz3TKNcYSn4p29p3KTCNG+DLUAtDc5uJbGdk3jMoXLQ/ed5y6QaUR1Hy 1Lv0CoHt3EetBTjfo6A2njSL3j0cGCqZ49hfK9QF7GBoeNzPDjyB4e2fH6RVnd4fX9g2 +rhM4zFydgLuwo3Wr9q+fn0OknLUKVsDHPyaEjjWGyQnbbJ0Akkr9AyzHcDjlJ493CQC ao9A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 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 90.92.71.90 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, Marc Zyngier , Christoffer Dall Subject: [PATCH 4.14 80/89] arm64: KVM: Fix SMCCC handling of unimplemented SMC/HVC calls Date: Mon, 22 Jan 2018 09:46:00 +0100 Message-Id: <20180122084002.470774698@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@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?1590281427731607418?= X-GMAIL-MSGID: =?utf-8?q?1590282159241700916?= 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: Marc Zyngier commit acfb3b883f6d6a4b5d27ad7fdded11f6a09ae6dd upstream. KVM doesn't follow the SMCCC when it comes to unimplemented calls, and inject an UNDEF instead of returning an error. Since firmware calls are now used for security mitigation, they are becoming more common, and the undef is counter productive. Instead, let's follow the SMCCC which states that -1 must be returned to the caller when getting an unknown function number. Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kvm/handle_exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -44,7 +44,7 @@ static int handle_hvc(struct kvm_vcpu *v ret = kvm_psci_call(vcpu); if (ret < 0) { - kvm_inject_undefined(vcpu); + vcpu_set_reg(vcpu, 0, ~0UL); return 1; } @@ -53,7 +53,7 @@ static int handle_hvc(struct kvm_vcpu *v static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) { - kvm_inject_undefined(vcpu); + vcpu_set_reg(vcpu, 0, ~0UL); return 1; }