From patchwork Thu May 6 17:58:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12242927 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 5A9FCC433ED for ; Thu, 6 May 2021 17:58:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C3CD6113E for ; Thu, 6 May 2021 17:58:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236509AbhEFR7e (ORCPT ); Thu, 6 May 2021 13:59:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236455AbhEFR7c (ORCPT ); Thu, 6 May 2021 13:59:32 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6135FC061761 for ; Thu, 6 May 2021 10:58:34 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id g27-20020a25b11b0000b02904f8641ec14cso992876ybj.12 for ; Thu, 06 May 2021 10:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=ancbaT0mva6sBIo0ZbeTujrtjNlUrJuCzlWUM3NuRWU=; b=iBQWdMoEMW3Ix1/ReNy3fOHblCht7nIjAJh+po7T62gIyn+JnfM7W/J3trRS/XlSnb 0CCFtbs54UnbBNj0FpvqEfUQxdfdgPUz/IWsMZhsuu3qR9PcF2Sx8uKBzP0ThbyjhSOn DhlufWaq6xGppWddxvjDYsRu+Dz6KAFUnKs0FPrT6Z6kja8aAnWOW/798NEMAbP7ygg5 aQZkFYH2d/lzyFoymM9ROM/u8KL5Wp9Mu2ahUM5MR5/o92SaFiytwAY++7U24zuD/DRC Tawrzt6QxOBqGT7J+XFFXfKWg4ZfoknNR0aCwsvP91/AL+ORQsxR0Gft/8h42wVzXt0V uM/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=ancbaT0mva6sBIo0ZbeTujrtjNlUrJuCzlWUM3NuRWU=; b=MCQAca6MbM+Cr49avG+Ro3YlyNJnmMAMvELZtZHjKg7NZV0NARIF5wcArGyrNnMJ5Z 98C+5iqikxkSGbYa1bacx//f+fFzE8zNvE237GiuCEsg+lYkxplkBTmzR9AEJelwRb76 yIiJqzpheXeRXnd78uMrabCZjwJ+i8rkxx1th7eBcXv3j/FmD54r4/HEJuWdR0UOQvEp YDLoag56LsD2RsCI3J1lRa05jBjNErosna5GWIf/AjPX+OckOEGdGfZktqHRuB7Naz3m q0YHpJ87CnXolnoEUNk72xWb1bSrWP/yeUn/ayx+p0lh3iEZA2UzCpCvuAs0VGDWVJZB 6a3g== X-Gm-Message-State: AOAM532Cm/ANrf5GQKlzWIO7M6AHQeChBmAwoGsi8nL++jseNnidtiY1 Pl78/0Oz1CQfNOHxdiS5H4OFyQQsgjM= X-Google-Smtp-Source: ABdhPJzpNwdgxL8bgvjkEpy2HNyWm/BDq06M8OiZAT5LesPCEyeyB78+drO+mdx0UJf79Yi0C0IvJlCLWSo= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:818d:5ca3:d49c:cfc8]) (user=seanjc job=sendgmr) by 2002:a25:d082:: with SMTP id h124mr7327204ybg.381.1620323913557; Thu, 06 May 2021 10:58:33 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 6 May 2021 10:58:25 -0700 In-Reply-To: <20210506175826.2166383-1-seanjc@google.com> Message-Id: <20210506175826.2166383-2-seanjc@google.com> Mime-Version: 1.0 References: <20210506175826.2166383-1-seanjc@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH 1/2] KVM: SVM: Return -EFAULT if copy_to_user() for SEV mig packet header fails From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , Steve Rutherford , Brijesh Singh , Ashish Kalra Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Return -EFAULT if copy_to_user() fails; if accessing user memory faults, copy_to_user() returns the number of bytes remaining, not an error code. Reported-by: Dan Carpenter Cc: Steve Rutherford Cc: Brijesh Singh Cc: Ashish Kalra Fixes: d3d1af85e2c7 ("KVM: SVM: Add KVM_SEND_UPDATE_DATA command") Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index a9d8d6aafdb8..1f99c240db6d 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1303,8 +1303,9 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) } /* Copy packet header to userspace. */ - ret = copy_to_user((void __user *)(uintptr_t)params.hdr_uaddr, hdr, - params.hdr_len); + if (copy_to_user((void __user *)(uintptr_t)params.hdr_uaddr, hdr, + params.hdr_len)) + ret = -EFAULT; e_free_trans_data: kfree(trans_data); From patchwork Thu May 6 17:58:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12242929 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 692C1C433ED for ; Thu, 6 May 2021 17:58:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 414556113E for ; Thu, 6 May 2021 17:58:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236522AbhEFR7h (ORCPT ); Thu, 6 May 2021 13:59:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236501AbhEFR7g (ORCPT ); Thu, 6 May 2021 13:59:36 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36167C06138B for ; Thu, 6 May 2021 10:58:37 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id a7-20020a5b00070000b02904ed415d9d84so6893543ybp.0 for ; Thu, 06 May 2021 10:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=Sd8WEj+PgaScYsgfeqR/hc4kupQ0VU11JVPKLdE8YCo=; b=EmxT2XYM2BzbyxRgqdF5HDGKtLZiZcnPRSifrgtlrx+r/MjFEWoZwrmSGBBERXCvs4 E4JIMwds8T6m90XBZR5l2O3QP443a+AwrHmBWyMelZNwrHPBAl4Hmh5arXGuu6h4J1iM Rm5uqjjM2FMI64lzQ6N2f/9WHBNjh93h4h4k4DibfmSfFvawbtvQyDP543alMfzc1l65 QF0bR1KJkLfrjd2TDw/0QZoQEf/ivFATCQI0/H4KRAxBNoVMS6hfzZYBkan+rz9iTHXu ovAMVNxKFNOlQWJwAKpD9wVIqcG6DgkfK39Cr601qCjML5V5yXkXrWg8GZCB98h7feyr MUdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=Sd8WEj+PgaScYsgfeqR/hc4kupQ0VU11JVPKLdE8YCo=; b=ITDRq9C9R/SEEnqUxsWkvVza1TrFMZeCi77ezVblg2F6fZZaaFqghQtz0MlprNUcfG tf3e6vXShz9Zq+s+PJqImCEj6xlVosfQkj98AsgmZ58dm1NlcvR3x0MYFJIbSoXol2Xw WvnKU9uKvbw5VbmIvb61NSg89QKuOEB2K334+YDOAMM0XN1E6vA/I/yjDMSalTO53ZHr /hWBJrpuXKTZTXrzhaPQ5LnpLz9NbxPhyixj+noF+1UTw3BruSuuG/Shd+K2uwhkZBb3 23cxDp6N/gL0+dTSz3c1bSDLhqgQGDf8jN73WWMBjDZjg3bn7KItItJi04R/BMWMw0lG uTFQ== X-Gm-Message-State: AOAM533t+2pKiFK13xNuO8lmd/UgQHG3cpziwn0fSneETQADNTWrSJ4S fGhX9Oa44H7OVYwd3gVGLF16TdzFNq8= X-Google-Smtp-Source: ABdhPJxC4+0lI0Mm3aAI52n+oh65A9gZczkK2o2BhouAnB7HbvxYpIa98mtba7ZNKqYNKGNKPSZi2lSApto= X-Received: from seanjc798194.pdx.corp.google.com ([2620:15c:f:10:818d:5ca3:d49c:cfc8]) (user=seanjc job=sendgmr) by 2002:a25:3496:: with SMTP id b144mr7152883yba.393.1620323915928; Thu, 06 May 2021 10:58:35 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 6 May 2021 10:58:26 -0700 In-Reply-To: <20210506175826.2166383-1-seanjc@google.com> Message-Id: <20210506175826.2166383-3-seanjc@google.com> Mime-Version: 1.0 References: <20210506175826.2166383-1-seanjc@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH 2/2] KVM: SVM: Fix sev_pin_memory() error checks in SEV migration utilities From: Sean Christopherson To: Paolo Bonzini Cc: Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , Steve Rutherford , Brijesh Singh , Ashish Kalra Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Use IS_ERR() instead of checking for a NULL pointer when querying for sev_pin_memory() failures. sev_pin_memory() always returns an error code cast to a pointer, or a valid pointer; it never returns NULL. Reported-by: Dan Carpenter Cc: Steve Rutherford Cc: Brijesh Singh Cc: Ashish Kalra Fixes: d3d1af85e2c7 ("KVM: SVM: Add KVM_SEND_UPDATE_DATA command") Fixes: 15fb7de1a7f5 ("KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command") Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/sev.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 1f99c240db6d..9b23b7ac60fa 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1265,8 +1265,8 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) /* Pin guest memory */ guest_page = sev_pin_memory(kvm, params.guest_uaddr & PAGE_MASK, PAGE_SIZE, &n, 0); - if (!guest_page) - return -EFAULT; + if (IS_ERR(guest_page)) + return PTR_ERR(guest_page); /* allocate memory for header and transport buffer */ ret = -ENOMEM; @@ -1457,11 +1457,12 @@ static int sev_receive_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) data.trans_len = params.trans_len; /* Pin guest memory */ - ret = -EFAULT; guest_page = sev_pin_memory(kvm, params.guest_uaddr & PAGE_MASK, PAGE_SIZE, &n, 0); - if (!guest_page) + if (IS_ERR(guest_page)) { + ret = PTR_ERR(guest_page); goto e_free_trans; + } /* The RECEIVE_UPDATE_DATA command requires C-bit to be always set. */ data.guest_address = (page_to_pfn(guest_page[0]) << PAGE_SHIFT) + offset;