From patchwork Tue Aug 1 15:53:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 129402 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2830291vqg; Tue, 1 Aug 2023 10:42:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlHU7QLv57YXvg5gzSZI7mOpEdzS4SbHAsi/XeZr2Szm4NXfwlHjT+lkvAYaRPXeYIIYTR6K X-Received: by 2002:a17:906:220c:b0:993:f2b4:13c9 with SMTP id s12-20020a170906220c00b00993f2b413c9mr2900243ejs.21.1690911747026; Tue, 01 Aug 2023 10:42:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690911747; cv=none; d=google.com; s=arc-20160816; b=n9cgvCfCrIOH3ZotBNOTw3DCmsZYKXt+LmiVWcdcNEBjluvjvO5xT66XljMZwFLshV 86AxOsq+OSqGoFwZ/xdZSxol4n3jqXVGRGevPB+GbEyKXrq6LwxSrR6Ns8v6lEK81qGv /ZYfcpOU93qiOHeEUAlqqClr1cFpjpjCg1eKBpGIOMe/9qpgUUW4Rwni6MJV+EvAxGyx adykg+Sn883+xZElZ3VQRSO4I3MLbKmOqElS0+QULmLqqGh6ObpzogAaAws9wroJ/Exw Pvh/cwcdk6wIxe9QTZZrZ2a8X3Hc8xUytc2CsphLq8MbQLIM1R6c6yAcuWn0QYnx33aX cA1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=6ii4XAGrPtq5rfz/6VphDSYMVOAoJKA+/p4wdrDYiew=; fh=LIw9KEWSwVyJpQv1HeKh1hUGd7mdw8q8mTqUKSlv244=; b=KLMoSF5HShDovUY2wYXfal58xJyabgBgJcjyHWRQ0d46gh48406QqeUOdMhA/ibyw1 18ahYExVFSZ3cph0Bn4ElRBAPnuk6IAYKy+zmBKCsUa1CVMjVNmqan7WNX8ujrhvv4nf rXYBOqSQxuyoy24bjALA8xWOKxqcOA0IhYimKJQJmw/F+0u5dl1Qpt6XiO0B0D/Zfr3z dw6+hQ9GqFTLwIhN8uH4KMDe7q/mswFxGqohiEXdB/6JYLm8nDfTxxujDJXCMQGfHtc3 j4y9NdFXnByFyfjxKWxdQpMwP1gA9rFFV2xomtDqa1fexjo91D06fOJd9/7C+0PvHRJk G2PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=N64ny0aE; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y13-20020a170906524d00b009935121ecd7si4928126ejm.639.2023.08.01.10.42.02; Tue, 01 Aug 2023 10:42:27 -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=@redhat.com header.s=mimecast20190719 header.b=N64ny0aE; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235026AbjHAPyw (ORCPT + 99 others); Tue, 1 Aug 2023 11:54:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235022AbjHAPyq (ORCPT ); Tue, 1 Aug 2023 11:54:46 -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 5505E1AA for ; Tue, 1 Aug 2023 08:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690905237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6ii4XAGrPtq5rfz/6VphDSYMVOAoJKA+/p4wdrDYiew=; b=N64ny0aE/gswuWppgE2Q3IiACIZdC25TaKqpAVp01xK4UwTkNTu4KiPYS3MgoamPuL1VBO 78b6KtBUkAL0+vc/rjLJQIVb2Ji7mUjvjymXiccqO0qC28BQM8mcCW12vsVCTTTy5EK5EZ Oh2f+7Gbz+mg0s3dsXeUo6Vdgiaoj64= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-145-6uWu9M3XOamg6JMuPLV17g-1; Tue, 01 Aug 2023 11:53:55 -0400 X-MC-Unique: 6uWu9M3XOamg6JMuPLV17g-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E3A0185A78F; Tue, 1 Aug 2023 15:53:55 +0000 (UTC) Received: from localhost (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id ACDE61454148; Tue, 1 Aug 2023 15:53:54 +0000 (UTC) From: Stefan Hajnoczi To: Alex Williamson Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Stefan Hajnoczi Subject: [PATCH] vfio/type1: fix cap_migration information leak Date: Tue, 1 Aug 2023 11:53:52 -0400 Message-ID: <20230801155352.1391945-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: 1773049475794219123 X-GMAIL-MSGID: 1773049475794219123 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 Reviewed-by: Kevin Tian --- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;