From patchwork Tue Jul 11 23:01:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 118743 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp792249vqm; Tue, 11 Jul 2023 16:06:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlHWCyHQCxKRZ0Kxnn+AI1NxKwOTIACVfYIpKp9bF4RMoug1G3PSjyitn4nxnnidsjWgZu7Y X-Received: by 2002:a17:903:230d:b0:1b8:7bd2:f77d with SMTP id d13-20020a170903230d00b001b87bd2f77dmr15870863plh.64.1689116807157; Tue, 11 Jul 2023 16:06:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689116807; cv=none; d=google.com; s=arc-20160816; b=gBSFh+Qi5bl2AJ6Ck7mUXPQiMSVi7+10qBkqJGbX1lx4M9TXtqLd3Lrb0O0hoDkLAA ViRaKBSTT7/YUM6xRt/6N0S0zylqNcxZHcyj921o8cbKdzm6NOorF3dR9G7fsuAK2nxX X/J3wn6h7dp7vj7ABDsoH5r3oESCdF7do6VT99tmlVrON6AQ6xBU2bPzZGgdB2zyZnJU iAqGMmqldoqd92r9VtgDLrl7VBzatC702BL2WYg84nzKEsoSP3EK2XGwlkP9FlAhwxS6 1eHqSZNrmkya774mJBwlHokkSLqbhDR41VPLorS8ZkmwhXc30EwNl9CVZ/92RjXXdUoA WT9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=NZYUXnjHPmQ/WMoe3NgtL+hMKetCK3WyAi/ewwv+qe0=; fh=WlkBVuaco6NrS/z+1f/wCzwszSt/RBqjyVC/qitxnws=; b=OnKYDz8pOPuOEHKT/rXDu1oSAWoCO5C6Se+GmsOs0B1DnFB2umhTYWhVLfKHOFU3T/ Rk2rAY3DZVZKzzhI5ULQn8dGUZbo5LuGcweh+b8ZkInAR0fNWHITno4EQ/npTQ7DDm9a cIOZJ9puyIbrg6/85SAO59n1x5UcawM3j2OfAXTFEHwrpWB3yeRz+ah6Pd2p7+huvYrc gpYLrTeynAQuQt5yoOosVwTGzSmv3Pk/32Ovq6Fu8g/0cWcQm1NPrFyRiCLkc/t4XoTS lu8lPywHZU2xY2fls9yJBBIhrH3oZBJ8Be9YFXYIQbFDMk6p12d6SAJ5pNw5+CHLzStp v1gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=l44qBzgB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id iz18-20020a170902ef9200b0019e57f5a5aesi2127496plb.567.2023.07.11.16.06.33; Tue, 11 Jul 2023 16:06:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=l44qBzgB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232073AbjGKXCN (ORCPT + 99 others); Tue, 11 Jul 2023 19:02:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232146AbjGKXCB (ORCPT ); Tue, 11 Jul 2023 19:02:01 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A4751BD6 for ; Tue, 11 Jul 2023 16:01:49 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1b8a4571c1aso64624805ad.0 for ; Tue, 11 Jul 2023 16:01:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689116509; x=1691708509; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=NZYUXnjHPmQ/WMoe3NgtL+hMKetCK3WyAi/ewwv+qe0=; b=l44qBzgB6Q7SSsjQQ711GNRtQ8qlOMLsmMgf6zreaVte1Im4NUmW6FKj+LT1tEJ8RO hR+9DexXG3PZhGuIm5YgC4YyxlYUsdSIakurMN/gb2LCu+2WXYx03xTMfim8bjxZ0MYJ m05at+g01AIaxdj8VVc8YP/xE43ba1hHeUTyXRsLXEg1grEM7ikivejicwH32E5WoOaK xbHxFXfDCDUskgotNbrIwV9pvIwQPxYbD6bFoYSJVzsadr7oUWIhKGvNKaFOa9dSEjXT lHfnSzEhc0UQqSEf7zRwCljA/cQwTMMzZz+1ywwFNxq2HQZtxYqFqzU8XPhuHaCYEruo KE1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689116509; x=1691708509; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NZYUXnjHPmQ/WMoe3NgtL+hMKetCK3WyAi/ewwv+qe0=; b=T5Kymj9H7A2EMoozb+HFyWYCDS1q2jKNvv9Y31uJrxImiMVg8fhJcg/R51H2dBIw7b McqphPriR5vsTFM0dTXC8kNLX1ZrlcSgAJJbGEtLx/Ivi8HTiy4YEgO/a60vs9R8qxeY 7UJlmESNaUviZ7rAW8jfCTLDY349fgq5tMs2liie9tWuUku4cAb5lJysCb533l3O8h3R qyewYSPxm5w/Odzxi2EVzkXD4rofgILAddgbxmkDJ29Gp9/J7WIKkb/9oWxyGluu0pO8 s1jyXySK+JXWXH+tQ7hwO3d9eWF+txz6lyQuf72jQ3gMcZiZGTvCahRSCrysPp2u9ctY PrQA== X-Gm-Message-State: ABy/qLZCdOr18KxtaEvMIURReTUEuAk1fFI+wP5l4Cv/+X81XsfvQLwN 5Eoil/8I5pA6HhqRTalFB/cKndUk3rE= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:a417:b0:1b8:8cd9:5355 with SMTP id p23-20020a170902a41700b001b88cd95355mr12083294plq.6.1689116508764; Tue, 11 Jul 2023 16:01:48 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 11 Jul 2023 16:01:31 -0700 In-Reply-To: <20230711230131.648752-1-seanjc@google.com> Mime-Version: 1.0 References: <20230711230131.648752-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230711230131.648752-8-seanjc@google.com> Subject: [PATCH 7/7] KVM: selftests: Verify stats fd is usable after VM fd has been closed From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Zheng Zhang , Kees Cook , Sean Christopherson X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771167345084299966 X-GMAIL-MSGID: 1771167345084299966 Verify that VM and vCPU binary stats files are usable even after userspace has put its last direct reference to the VM. This is a regression test for a UAF bug where KVM didn't gift the stats files a reference to the VM. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/kvm_binary_stats_test.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/kvm_binary_stats_test.c b/tools/testing/selftests/kvm/kvm_binary_stats_test.c index 5317e27b77d0..698c1cfa3111 100644 --- a/tools/testing/selftests/kvm/kvm_binary_stats_test.c +++ b/tools/testing/selftests/kvm/kvm_binary_stats_test.c @@ -252,6 +252,14 @@ int main(int argc, char *argv[]) stats_test(vcpu_get_stats_fd(vcpus[i * max_vcpu + j])); } + /* + * Close the VM fd and redo the stats tests. KVM should gift a + * reference (to the VM) to each stats fd, i.e. stats should + * still be accessible even after userspace has put its last + * _direct_ reference to the VM. + */ + kvm_vm_free(vms[i]); + stats_test(vm_stats_fds); for (j = 0; j < max_vcpu; ++j) stats_test(vcpu_stats_fds[j]); @@ -259,8 +267,6 @@ int main(int argc, char *argv[]) ksft_test_result_pass("vm%i\n", i); } - for (i = 0; i < max_vm; ++i) - kvm_vm_free(vms[i]); free(vms); free(vcpus); free(vcpu_stats_fds);