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=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 C23F2C433B4 for ; Thu, 29 Apr 2021 01:00:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A78361440 for ; Thu, 29 Apr 2021 01:00:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232750AbhD2BBB (ORCPT ); Wed, 28 Apr 2021 21:01:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229624AbhD2BA7 (ORCPT ); Wed, 28 Apr 2021 21:00:59 -0400 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B507C06138B for ; Wed, 28 Apr 2021 18:00:14 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id s20so17999020plr.13 for ; Wed, 28 Apr 2021 18:00:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=W1foyVnHpt10zkANi9y0LWp7jrRDQd/Q7wAouJW7aRU=; b=l0enqpDX6x7/rQ/qhKF4XS/4BoLoz2AHWukBmE29ObLVOk7DOcHRi1ABbXlXZ/mbKI gTvEh3P2XsGnujeGXSCa99jrGp4J6td9wZOVTUs/KZwwxIuVjCOKUuGkKsUl8QI1npFz XfXBXDVswe5VSNifnAhJp2j/P3+ptoAye9aN/5HVivKg2Er7aGzTVLrDGU3hglCFMXic YROk6OR7rBzv/ifeBonAwUsWOiHGGLTQWatjKEQtWK+CoT999dY+Fj26fsWVrAAnasKx zMeNQzFD6UViMEA7Vg69DpU2tXqZlS44ForW8kl4IsPVVovQ2n3U9POGTXArPoWJVRWF xyzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=W1foyVnHpt10zkANi9y0LWp7jrRDQd/Q7wAouJW7aRU=; b=bMZdsRa+hDp9iI3qbnagftRKH40iboW+wzurzWEUUuvUvDQZL9k5GFxXLj4wlLp0+7 2KOKAHjZO1sWxBWSB5dbQPr8is53aChxQ2x12xjV7E/uBbFUvz2r7SIswb4gdfTQzFNK j9XMZ0LjvY02GOPuH1XaA27RdpAfgYdaJAe0G/yg5fbN9LKHwY1krRAnDvzQv2mof52W pBsMSyUs2Y4JuvAX4Ru2s7nye9EidjC5J4vbAnoOSfcnM+sPHlEyIliQLawExbjAObFu CCrvZOpLOAudWojBaTDD/mP5pZV5JOJcjrR6biuyhTOAbxw0fBkIEc/2b5deuI/OsX1O IcjQ== X-Gm-Message-State: AOAM5300krBoaY7KSHnH0kvKulErs8BbK3QeGa8FtGNyh53c7u9Qwflt orIcWmjbt8ZJTr8QCIkoJr6vug== X-Google-Smtp-Source: ABdhPJzn0rzOp7Odw2sXRwk+fWNrSxVdAPCKwhagPdWng4HyaQb+oJYvsO5jwpedNc8uRrmK9PtTZQ== X-Received: by 2002:a17:902:7e86:b029:ed:74b7:8fd4 with SMTP id z6-20020a1709027e86b02900ed74b78fd4mr4989129pla.21.1619658010508; Wed, 28 Apr 2021 18:00:10 -0700 (PDT) Received: from google.com (240.111.247.35.bc.googleusercontent.com. [35.247.111.240]) by smtp.gmail.com with ESMTPSA id 5sm729450pfi.43.2021.04.28.18.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Apr 2021 18:00:10 -0700 (PDT) Date: Thu, 29 Apr 2021 01:00:06 +0000 From: Sean Christopherson To: Valeriy Vdovin Cc: linux-kernel@vger.kernel.org, Denis Lunev , Paolo Bonzini , Jonathan Corbet , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Shuah Khan , Aaron Lewis , Alexander Graf , Andrew Jones , Oliver Upton , Like Xu , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH v4] KVM: x86: Fix KVM_GET_CPUID2 ioctl to return cpuid entries count Message-ID: References: <20210428172729.3551-1-valeriy.vdovin@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210428172729.3551-1-valeriy.vdovin@virtuozzo.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Wed, Apr 28, 2021, Valeriy Vdovin wrote: > It's very explicit by the code that it was designed to receive some > small number of entries to return E2BIG along with the corrected number. LOL, saying KVM_GET_CPUID2 was "designed" is definitely giving the KVM forefathers the benefit of the doubt. > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index efc7a82ab140..3f941b1f4e78 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -4773,14 +4773,17 @@ long kvm_arch_vcpu_ioctl(struct file *filp, > r = -EFAULT; > if (copy_from_user(&cpuid, cpuid_arg, sizeof(cpuid))) > goto out; > + > r = kvm_vcpu_ioctl_get_cpuid2(vcpu, &cpuid, > cpuid_arg->entries); > - if (r) > + > + if (r && r != -E2BIG) > goto out; > - r = -EFAULT; > - if (copy_to_user(cpuid_arg, &cpuid, sizeof(cpuid))) > + > + if (copy_to_user(cpuid_arg, &cpuid, sizeof(cpuid))) { > + r = -EFAULT; > goto out; As I pointed out[*], copying the number of entries but not the entries themselves is wrong. All of my feedback on v1 still stands. [*] https://lkml.kernel.org/r/YIl4M/GgaYvwNuXv@google.com > - r = 0; > + } > break; > } > case KVM_GET_MSRS: {