Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   David Edmondson <david.edmondson@oracle.com>
To:     linux-kernel@vger.kernel.org
Cc:     "H. Peter Anvin" <hpa@zytor.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>, x86@kernel.org,
        Joerg Roedel <joro@8bytes.org>, Ingo Molnar <mingo@redhat.com>,
        kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
        Jim Mattson <jmattson@google.com>,
        Borislav Petkov <bp@alien8.de>,
        Sean Christopherson <seanjc@google.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Wanpeng Li <wanpengli@tencent.com>,
        David Matlack <dmatlack@google.com>,
        David Edmondson <david.edmondson@oracle.com>
Subject: [PATCH v6 4/4] KVM: x86: SGX must obey the KVM_INTERNAL_ERROR_EMULATION protocol
Date:   Mon, 20 Sep 2021 11:37:37 +0100
Message-Id: <20210920103737.2696756-5-david.edmondson@oracle.com>
In-Reply-To: <20210920103737.2696756-1-david.edmondson@oracle.com>
References: <20210920103737.2696756-1-david.edmondson@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i13ZJpmF0vAKyJr/n1w95zN257aePhJG3VcUCPALT+/lLvnV6sMJyzZm1FZm?=
 =?us-ascii?Q?7RPy/trTET6YED+tJ1JHNft/GcRh//ceEpNm/eZVB96YlNrlawur3v1ymudI?=
 =?us-ascii?Q?zbBx4AkCxBzAboj72G8JuO4UP57exgz94NJiNLkOqpb0f/WQQQKWWWVZEpmK?=
 =?us-ascii?Q?mml4J5JTnsW3QJ1Mb8MYJcxJN93eF1GaFlNHL0oHv4ZnszHT6blJ85Hfl5+p?=
 =?us-ascii?Q?c8Kxs4KDkTAIDol3bjdtOSKako4VkbfQtVNDEh8VI1hRi+FbQ0V/OLZUFq0r?=
 =?us-ascii?Q?pTZWstHli/xif/+P3QH7Y7UiLtpySGVSCChsXQ8tFVmb9/XDX3l73ZzD+0eo?=
 =?us-ascii?Q?oOyWxJLPnj1Mjq1gNqR5c9DeTZpgihqm4Lhv/BudX/iGkt0CqenueFhhLvr1?=
 =?us-ascii?Q?GRK3vGLF/4CE82rc6Kb+FBcNHtGYFlOPhJ4cI4M/gSod3FbHc1c+mgfi5CJ/?=
 =?us-ascii?Q?BB0zhSUZ4Vjj1/mCgToiSkzMAiafeSgPmGDnEe0jf7k690m4pR0ZtvA52lQ6?=
 =?us-ascii?Q?PlUXjRKfDoUrHwhbnQLhlfW82WR2Gnlm0MsY5+/ioYqulPHG4z7FaaWAZ/z6?=
 =?us-ascii?Q?yC4rSqaJX+Rk0lfxflqNcUteY9UW3lWaknOCX4IV3xc4+9C5DV6Gfy80Vw+4?=
 =?us-ascii?Q?CG8hZzVPTOFMnTTY8E6MMwMYwGvdZPeJh9Pc1OBHWIHEjqwjeFiz2n7BORcK?=
 =?us-ascii?Q?h046KSBnIRQJvI6UCqOmf0TjUd+A/OOSzh3fwb51+U1xFA7MpayIdRfOllzP?=
 =?us-ascii?Q?sXEjrhMy3hLVPwFUUte19AKjwLbbVaY6XrEqArNKOni92NVKbJ62lET+Zv6T?=
 =?us-ascii?Q?r1EcZ1AhTfoxY/CoYOu8I7TX9GdFzn7lx+3R/07sh+MEUU/HQx5FsvrqgVDE?=
 =?us-ascii?Q?RvvJXywC51fWZpf37jZP1qAprlF2AkAv08eiD7iSz/Vll4q1qDgoSC3aqGte?=
 =?us-ascii?Q?WCRrnarggnUeyKwr1tf22KpiZcULgqiYC0z2FYjs1kvKwuX4jblUDl4XUERl?=
 =?us-ascii?Q?EBcCRBEFQAWsyYjuPf+IMyDF8ugnXp00gr6SGML6szl4B9QM7Dz3pYvuqWti?=
 =?us-ascii?Q?BsJSWUXd2nlH+i7gfvP1FWJOgUBWPNntFBJv0CEYqyY2NSJITX9YDJn4wYRW?=
 =?us-ascii?Q?F5ccoyX6oDTza8nTal6xA7RV9T5S8qDAf8CSZBdRFYTBv8zvC2RFNN03cLiu?=
 =?us-ascii?Q?EIplaTN3NBERqjCn5GP1c3xZofQbFdVwdaZdNLtfm7aewfrbVq+Qmowo7NFT?=
 =?us-ascii?Q?kRKONH/lOnZPoQDp+1eqEtj6M8Ef6p3BTw15R5vVsrB20Hf6LI4dxkgW1jse?=
 =?us-ascii?Q?9OZteLA4C37p7NWrV1W0zIZ5mnD9Q+58HS6vs8pq6o74Sw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d595265-297a-4376-f831-08d97c22b118
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3148.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2021 10:37:49.2261
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: XlZdSbrwJTSnf7W26Zxelk/mHqZ8XQPFATqgj1RifFEm3Tzn0tr3X5tuo8qS8DYOGuiHXXjEJio5QjLJRYegI2KHNVJFw3jLTn3Ly7cuW3U=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3308
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10112 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 adultscore=0
 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001
 definitions=main-2109200064
X-Proofpoint-GUID: rAQiC_zffUqcDE8_mw3ATGrEeG_fOHl9
X-Proofpoint-ORIG-GUID: rAQiC_zffUqcDE8_mw3ATGrEeG_fOHl9
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When passing the failing address and size out to user space, SGX must
ensure not to trample on the earlier fields of the emulation_failure
sub-union of struct kvm_run.

Signed-off-by: David Edmondson <david.edmondson@oracle.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kvm/vmx/sgx.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/arch/x86/kvm/vmx/sgx.c b/arch/x86/kvm/vmx/sgx.c
index 6693ebdc0770..35e7ec91ae86 100644
--- a/arch/x86/kvm/vmx/sgx.c
+++ b/arch/x86/kvm/vmx/sgx.c
@@ -53,11 +53,9 @@ static int sgx_get_encls_gva(struct kvm_vcpu *vcpu, unsigned long offset,
 static void sgx_handle_emulation_failure(struct kvm_vcpu *vcpu, u64 addr,
 					 unsigned int size)
 {
-	vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
-	vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
-	vcpu->run->internal.ndata = 2;
-	vcpu->run->internal.data[0] = addr;
-	vcpu->run->internal.data[1] = size;
+	uint64_t data[2] = { addr, size };
+
+	__kvm_prepare_emulation_failure_exit(vcpu, data, ARRAY_SIZE(data));
 }
 
 static int sgx_read_hva(struct kvm_vcpu *vcpu, unsigned long hva, void *data,
@@ -112,9 +110,7 @@ static int sgx_inject_fault(struct kvm_vcpu *vcpu, gva_t gva, int trapnr)
 	 * but the error code isn't (yet) plumbed through the ENCLS helpers.
 	 */
 	if (trapnr == PF_VECTOR && !boot_cpu_has(X86_FEATURE_SGX2)) {
-		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
-		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
-		vcpu->run->internal.ndata = 0;
+		kvm_prepare_emulation_failure_exit(vcpu);
 		return 0;
 	}
 
@@ -155,9 +151,7 @@ static int __handle_encls_ecreate(struct kvm_vcpu *vcpu,
 	sgx_12_0 = kvm_find_cpuid_entry(vcpu, 0x12, 0);
 	sgx_12_1 = kvm_find_cpuid_entry(vcpu, 0x12, 1);
 	if (!sgx_12_0 || !sgx_12_1) {
-		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
-		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_EMULATION;
-		vcpu->run->internal.ndata = 0;
+		kvm_prepare_emulation_failure_exit(vcpu);
 		return 0;
 	}
 
-- 
2.33.0