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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00E84C3DA58 for ; Thu, 17 Aug 2023 17:57:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353344AbjHQR4j (ORCPT ); Thu, 17 Aug 2023 13:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352926AbjHQR4H (ORCPT ); Thu, 17 Aug 2023 13:56:07 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D96119A1 for ; Thu, 17 Aug 2023 10:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692294930; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PXnE3oQ7Ijeiq5xZy1Iauyqm0pyudGTEGiUZtSXw3Qw=; b=RBolWuRlEDczv7r+BaWqp4KRcSvh7KGy20qTs4yyPcAr9Ex+D3Mz4Vu/kcMYZxUzt8KaOA mCbbbk0/VcqZZP0lD9S+L1kKZLuZJOxL8vh0zueF4aFCH4x5HPx3c8LbRR6aImBTWC7hFK SS7Ve3ECn7MlAhEsk0OLVWHnL2My/Dg= Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-QycVId0nMkqa-bLxQ_6qmA-1; Thu, 17 Aug 2023 13:55:28 -0400 X-MC-Unique: QycVId0nMkqa-bLxQ_6qmA-1 Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-790c9aa32d5so2844639f.2 for ; Thu, 17 Aug 2023 10:55:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692294927; x=1692899727; h=content-transfer-encoding:mime-version:organization:references :in-reply-to:message-id:subject:cc:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PXnE3oQ7Ijeiq5xZy1Iauyqm0pyudGTEGiUZtSXw3Qw=; b=b+oREUZ2j6EEP+UINKmPq+GQFQUJ08UPJ9168U/YV9PGH9VG8pgysy8vqPZAE+VRoZ 4vW5JfZvyGveo4a5u6g4IXDFneDYEbDD5luGWDbTX+wKJ9proOv0pOpDlv6LXMHt3nxC V/m/kcwCV/fdTtVTw5kkd+nXHzhON7/8rihmxNYkm5CW4uiq4xZerHfiQ1/X3nj7ffwB Lg0Tc77UC28xECd4MWfxqPoa6mAXH0xeBbK3Gkfr/A1E2quo7tSbUAsao30fByo1UHI9 wV2J1ZzkvVqIOq1u/ig3PIpWzUMgW9e1m3JkHREF6EvJT+fCb+mAXgoQy1R3R2fNS24q eblg== X-Gm-Message-State: AOJu0YyHL5g+2rrm8qIXgR5GNpQMPk60rOMtz2UqNqgDfG+/nFfV7fGb zEUkDeeHpW2ZMu85Z5Y7R9AT+SvOfKvUcUem1KXlRj72mnKwHZAawFAHPUIIVJIuhBPJS8E6ZtJ DnqjtxUMmcoKt X-Received: by 2002:a5d:9741:0:b0:791:1e87:b47a with SMTP id c1-20020a5d9741000000b007911e87b47amr360605ioo.14.1692294927585; Thu, 17 Aug 2023 10:55:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGFpk7bhCZKpwXWcm/cP+vn6eMM4NVHT1F17qUVO5PRiKYLHx0tKZMwwGkdF5hF7Wv+KxgilQ== X-Received: by 2002:a5d:9741:0:b0:791:1e87:b47a with SMTP id c1-20020a5d9741000000b007911e87b47amr360592ioo.14.1692294927331; Thu, 17 Aug 2023 10:55:27 -0700 (PDT) Received: from redhat.com ([38.15.60.12]) by smtp.gmail.com with ESMTPSA id d9-20020a056602064900b0078680780694sm23841iox.34.2023.08.17.10.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 10:55:26 -0700 (PDT) Date: Thu, 17 Aug 2023 11:55:26 -0600 From: Alex Williamson To: Stefan Hajnoczi Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH] vfio/type1: fix cap_migration information leak Message-ID: <20230817115526.04b3bf72.alex.williamson@redhat.com> In-Reply-To: <20230801155352.1391945-1-stefanha@redhat.com> References: <20230801155352.1391945-1-stefanha@redhat.com> Organization: Red Hat MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, 1 Aug 2023 11:53:52 -0400 Stefan Hajnoczi wrote: > Fix an information leak where an uninitialized hole in struct > vfio_iommu_type1_info_cap_migration on the stack is exposed to userspace. > > The definition of struct vfio_iommu_type1_info_cap_migration contains a hole as > shown in this pahole(1) output: > > struct vfio_iommu_type1_info_cap_migration { > struct vfio_info_cap_header header; /* 0 8 */ > __u32 flags; /* 8 4 */ > > /* XXX 4 bytes hole, try to pack */ > > __u64 pgsize_bitmap; /* 16 8 */ > __u64 max_dirty_bitmap_size; /* 24 8 */ > > /* size: 32, cachelines: 1, members: 4 */ > /* sum members: 28, holes: 1, sum holes: 4 */ > /* last cacheline: 32 bytes */ > }; > > The cap_mig variable is filled in without initializing the hole: > > static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, > struct vfio_info_cap *caps) > { > struct vfio_iommu_type1_info_cap_migration cap_mig; > > cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION; > cap_mig.header.version = 1; > > cap_mig.flags = 0; > /* support minimum pgsize */ > cap_mig.pgsize_bitmap = (size_t)1 << __ffs(iommu->pgsize_bitmap); > cap_mig.max_dirty_bitmap_size = DIRTY_BITMAP_SIZE_MAX; > > return vfio_info_add_capability(caps, &cap_mig.header, sizeof(cap_mig)); > } > > The structure is then copied to a temporary location on the heap. At this point > it's already too late and ioctl(VFIO_IOMMU_GET_INFO) copies it to userspace > later: > > int vfio_info_add_capability(struct vfio_info_cap *caps, > struct vfio_info_cap_header *cap, size_t size) > { > struct vfio_info_cap_header *header; > > header = vfio_info_cap_add(caps, size, cap->id, cap->version); > if (IS_ERR(header)) > return PTR_ERR(header); > > memcpy(header + 1, cap + 1, size - sizeof(*header)); > > return 0; > } > > This issue was found by code inspection. > > Signed-off-by: Stefan Hajnoczi > --- > drivers/vfio/vfio_iommu_type1.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to vfio next branch for v6.6. I'll give Jason a little more time to ack "[PATCH v3] vfio: align capability structures". Thanks! Alex > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index ebe0ad31d0b0..d662aa9d1b4b 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -2732,7 +2732,7 @@ static int vfio_iommu_iova_build_caps(struct vfio_iommu *iommu, > static int vfio_iommu_migration_build_caps(struct vfio_iommu *iommu, > struct vfio_info_cap *caps) > { > - struct vfio_iommu_type1_info_cap_migration cap_mig; > + struct vfio_iommu_type1_info_cap_migration cap_mig = {}; > > cap_mig.header.id = VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION; > cap_mig.header.version = 1;