From patchwork Wed Aug 9 21:02:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 133630 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp97720vqi; Wed, 9 Aug 2023 17:39:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEmYhQs4ty+phGhT7pQGS6Bem8QQjiXfFjiNAa2rpyJBmYRFpeXBxu47oDC1AnJr5odGr4B X-Received: by 2002:a05:6870:93c3:b0:1ad:2e18:7090 with SMTP id c3-20020a05687093c300b001ad2e187090mr1082105oal.32.1691627952505; Wed, 09 Aug 2023 17:39:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691627952; cv=none; d=google.com; s=arc-20160816; b=zujYOfkf/OX/KD+Bh4hP0PI6NQ1rNmZWZxcffmeZcphPFeOeRTr9PzZenZzQNartuC lg3Oww0lTfmmRdm6R2WEwOPrd/f1s7AajrkNQoPoU4XlCW5e62MJAZ36jzJu9OagHFBG X75Tps/SdOR6mUQoM5s87O9MO+8oG7jWgpFu4TQx+QXtjO+yqgQTvZJRb6dCbrbKQ1TF Bjf2VYddLPslgxTXdbz+PaQxaxJol/y3BUtEp8sq8aL+tCmO0Peap9s2UsdJ6+bcCXdJ CyshVGooLOH4P1DYjBcl4sOM71HE36MIcU06Ua3dC4VXc7DzmOPW+8WXI820qYVG2GQG b4ew== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=wyGZDO6+cs0Dn/l2naooCm9LYp0IvC76ZpjNX9Hb8V4=; fh=Jwapm4lq68h1feOUtcYIIIrxRv5RQSItvJsoua3O5Rw=; b=YS/ygIx18kBCjRlPw0FGrBb6MWNWG8m5DTDI4pMClju8ZikQTbkqkQRnHMudYG6dD+ kgK7t/GB6DbZtIslVF854a5qwpgo8fIGzi0yg28fyV5s4os0mt23gd9myHVBUIP+k3SC 64m1QGvsTV1hJJoxlMQm2tHHkUeK7ZcUtKC+zpnrhXu6EboOuCuaL+6s0iP/NyYGbD0C IK/uSelK/QzETWyPBEOojh62koqaAUdwMjAQcJqAmPbTKlZ0uba+IJnXQhgjqGCEaisH 5epFeo5PWdETIgpFAFfSkYZ1htGL5afZRcRXpQ9HiQu8OpaiWpFAgAxMoER8atMiFLkz 9jmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TYJLrBeI; 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 v24-20020a63f218000000b005638d4f21a8si342179pgh.855.2023.08.09.17.38.59; Wed, 09 Aug 2023 17:39:12 -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=TYJLrBeI; 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 S232790AbjHIVEX (ORCPT + 99 others); Wed, 9 Aug 2023 17:04:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232278AbjHIVEV (ORCPT ); Wed, 9 Aug 2023 17:04:21 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D12CE75 for ; Wed, 9 Aug 2023 14:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691615019; 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: in-reply-to:in-reply-to:references:references; bh=wyGZDO6+cs0Dn/l2naooCm9LYp0IvC76ZpjNX9Hb8V4=; b=TYJLrBeI2F0+9ExVA1rXmgGiujxGdX487cWCWN7TPGUzJ0fWEWchYHD/SgAJbowtLJHe1h 0wPJEq4r+EFYzHsnioIgSdvEzkiV25XRFFgmnyeirfXJ5LDmqwXJu+Cp1Wp3AjIM8nKi5m c+JyEX3BFm5oBK+oK4uxp3/CAJppqco= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-606-kXMhG4BlMWOXEsD45UptFQ-1; Wed, 09 Aug 2023 17:03:34 -0400 X-MC-Unique: kXMhG4BlMWOXEsD45UptFQ-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 4774E2999B23; Wed, 9 Aug 2023 21:03:34 +0000 (UTC) Received: from localhost (unknown [10.39.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8D3C140E914; Wed, 9 Aug 2023 21:03:17 +0000 (UTC) From: Stefan Hajnoczi To: kvm@vger.kernel.org Cc: Jason Gunthorpe , "Tian, Kevin" , linux-kernel@vger.kernel.org, Alex Williamson , Stefan Hajnoczi Subject: [PATCH 1/4] vfio: trivially use __aligned_u64 for ioctl structs Date: Wed, 9 Aug 2023 17:02:45 -0400 Message-ID: <20230809210248.2898981-2-stefanha@redhat.com> In-Reply-To: <20230809210248.2898981-1-stefanha@redhat.com> References: <20230809210248.2898981-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 autolearn=unavailable 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: 1773800471807726370 X-GMAIL-MSGID: 1773800471807726370 u64 alignment behaves differently depending on the architecture and so offers __aligned_u64 to achieve consistent behavior in kernel<->userspace ABIs. There are structs in that can trivially be updated to __aligned_u64 because the struct sizes are multiples of 8 bytes. There is no change in memory layout on any CPU architecture and therefore this change is safe. The commits that follow this one handle the trickier cases where explanation about ABI breakage is necessary. Suggested-by: Jason Gunthorpe Signed-off-by: Stefan Hajnoczi --- include/uapi/linux/vfio.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 20c804bdc09c..b1dfcf3b7665 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -276,8 +276,8 @@ struct vfio_region_info { #define VFIO_REGION_INFO_FLAG_CAPS (1 << 3) /* Info supports caps */ __u32 index; /* Region index */ __u32 cap_offset; /* Offset within info struct of first cap */ - __u64 size; /* Region size (bytes) */ - __u64 offset; /* Region offset from start of device fd */ + __aligned_u64 size; /* Region size (bytes) */ + __aligned_u64 offset; /* Region offset from start of device fd */ }; #define VFIO_DEVICE_GET_REGION_INFO _IO(VFIO_TYPE, VFIO_BASE + 8) @@ -293,8 +293,8 @@ struct vfio_region_info { #define VFIO_REGION_INFO_CAP_SPARSE_MMAP 1 struct vfio_region_sparse_mmap_area { - __u64 offset; /* Offset of mmap'able area within region */ - __u64 size; /* Size of mmap'able area */ + __aligned_u64 offset; /* Offset of mmap'able area within region */ + __aligned_u64 size; /* Size of mmap'able area */ }; struct vfio_region_info_cap_sparse_mmap { @@ -449,9 +449,9 @@ struct vfio_device_migration_info { VFIO_DEVICE_STATE_V1_RESUMING) __u32 reserved; - __u64 pending_bytes; - __u64 data_offset; - __u64 data_size; + __aligned_u64 pending_bytes; + __aligned_u64 data_offset; + __aligned_u64 data_size; }; /* @@ -475,7 +475,7 @@ struct vfio_device_migration_info { struct vfio_region_info_cap_nvlink2_ssatgt { struct vfio_info_cap_header header; - __u64 tgt; + __aligned_u64 tgt; }; /* From patchwork Wed Aug 9 21:02:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 133623 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp80481vqi; Wed, 9 Aug 2023 16:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAdkAQHjfMb7L7TN2cxLgm/3VRWGqQ2MmDFu2ckjaG+WDtB1YgaJgSMlkHfRIjnuDKFu05 X-Received: by 2002:a05:6870:d60e:b0:1ba:199a:984a with SMTP id a14-20020a056870d60e00b001ba199a984amr945204oaq.55.1691625404236; Wed, 09 Aug 2023 16:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691625404; cv=none; d=google.com; s=arc-20160816; b=ISMaJR0AzJtDHXid8OFMgNvsQ1CRzo2oSCl2kzNXc3Vyo/I4pa0aIJeoc39xwDaMqk if0LiNjEyo3q8k7sv8jPpZTAg7/lja3hBpzocrdw2Zwk5ReQ+XRCN14fJ/O5dyPDkUMD VLya3pPOQVCczZ2AOyilBopB/T+tce0rVLZ6sqPAHagmx0EB6LHnox3T4xgCU5997CrZ E3F1RJ/faD2GtJXdlMsN0gyc/ZckkRKX0e/A9K03yFbn6wrHk7V533rE0AK91zUfMX+D tlA/rL7LsJpGcugBNq19LButD4+QQPivEc5aY4yW+pLm7eggsqSzHCfakXGdKHKDjJoM CgzA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=+34Kxh+IXA75qZRSAThsF0lzd7JtEgbFkW9igt207zc=; fh=Jwapm4lq68h1feOUtcYIIIrxRv5RQSItvJsoua3O5Rw=; b=NKCMS+pWJAmW62SawBQDgFpY7SiJMg9PNHp5jX5OYBj7GSYhU3rWNlxLQOmSgeNNhO I5j2w947MUrR+swEsOXHirQ+JI20+OYwCyzGP2a5ma8GHAJlwtIYfwDBv5D+aXpODie3 zLL33Ow+OZ6lvGv2F9XFB+FsSxRIfnIefZDnrNj8NacI3znNYYSQj3QzBb6mKqCBO8W9 KnXQTqGX9fhYixfKIIfloTMprqbtudZMKC4kc3EQ1eFUBH7Fu7LZ1I4wvxr48eqzKB/i WqYh3jELpxHoDjQx0sl4EKVqOxPiVrZAjVmlij2q3pXcHUVdeQsH8IpfgzvKyLULsJ9D Xh2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PQPlJhf7; 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 h22-20020a633856000000b00553b9b18878si287374pgn.454.2023.08.09.16.56.25; Wed, 09 Aug 2023 16:56:44 -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=PQPlJhf7; 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 S233153AbjHIVEg (ORCPT + 99 others); Wed, 9 Aug 2023 17:04:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232473AbjHIVEa (ORCPT ); Wed, 9 Aug 2023 17:04:30 -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 7DEC7E76 for ; Wed, 9 Aug 2023 14:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691615020; 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: in-reply-to:in-reply-to:references:references; bh=+34Kxh+IXA75qZRSAThsF0lzd7JtEgbFkW9igt207zc=; b=PQPlJhf7LUVtsUZ5KeS8ZuJJ1jLpkF/0U5FuYUmMhVcpXDbIwbNRjv1ztHf0WYH/T1kshd uX19eTW+qk6Gs0SQs31PFJKubxjsjpo63SX1P4hJd3oC/v+jP9r5yUA0b+fhJExijtVCHT eRNVJHfaiCDwSdGU4BVOZXkVvXMpOuI= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-685-BcMmNP0QPOWTz6848GGn6Q-1; Wed, 09 Aug 2023 17:03:37 -0400 X-MC-Unique: BcMmNP0QPOWTz6848GGn6Q-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E9B943C0E44D; Wed, 9 Aug 2023 21:03:36 +0000 (UTC) Received: from localhost (unknown [10.39.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E1351121314; Wed, 9 Aug 2023 21:03:36 +0000 (UTC) From: Stefan Hajnoczi To: kvm@vger.kernel.org Cc: Jason Gunthorpe , "Tian, Kevin" , linux-kernel@vger.kernel.org, Alex Williamson , Stefan Hajnoczi Subject: [PATCH 2/4] vfio: use __aligned_u64 in struct vfio_device_gfx_plane_info Date: Wed, 9 Aug 2023 17:02:46 -0400 Message-ID: <20230809210248.2898981-3-stefanha@redhat.com> In-Reply-To: <20230809210248.2898981-1-stefanha@redhat.com> References: <20230809210248.2898981-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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 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: 1773797800002320810 X-GMAIL-MSGID: 1773797800002320810 The memory layout of struct vfio_device_gfx_plane_info is architecture-dependent due to a u64 field and a struct size that is not a multiple of 8 bytes: - On x86_64 the struct size is padded to a multiple of 8 bytes. - On x32 the struct size is only a multiple of 4 bytes, not 8. - Other architectures may vary. Use __aligned_u64 to make memory layout consistent. This reduces the chance of holes that result in an information leak and the chance that 32-bit userspace on a 64-bit kernel breakage. This patch increases the struct size on x32 but this is safe because of the struct's argsz field. The kernel may grow the struct as long as it still supports smaller argsz values from userspace (e.g. applications compiled against older kernel headers). Suggested-by: Jason Gunthorpe Signed-off-by: Stefan Hajnoczi --- include/uapi/linux/vfio.h | 3 ++- drivers/gpu/drm/i915/gvt/kvmgt.c | 4 +++- samples/vfio-mdev/mbochs.c | 6 ++++-- samples/vfio-mdev/mdpy.c | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index b1dfcf3b7665..45db62d74064 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -746,7 +746,7 @@ struct vfio_device_gfx_plane_info { __u32 drm_plane_type; /* type of plane: DRM_PLANE_TYPE_* */ /* out */ __u32 drm_format; /* drm format of plane */ - __u64 drm_format_mod; /* tiled mode */ + __aligned_u64 drm_format_mod; /* tiled mode */ __u32 width; /* width of plane */ __u32 height; /* height of plane */ __u32 stride; /* stride of plane */ @@ -759,6 +759,7 @@ struct vfio_device_gfx_plane_info { __u32 region_index; /* region index */ __u32 dmabuf_id; /* dma-buf id */ }; + __u32 reserved; }; #define VFIO_DEVICE_QUERY_GFX_PLANE _IO(VFIO_TYPE, VFIO_BASE + 14) diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c index de675d799c7d..ffab3536dc8a 100644 --- a/drivers/gpu/drm/i915/gvt/kvmgt.c +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c @@ -1382,7 +1382,7 @@ static long intel_vgpu_ioctl(struct vfio_device *vfio_dev, unsigned int cmd, intel_gvt_reset_vgpu(vgpu); return 0; } else if (cmd == VFIO_DEVICE_QUERY_GFX_PLANE) { - struct vfio_device_gfx_plane_info dmabuf; + struct vfio_device_gfx_plane_info dmabuf = {}; int ret = 0; minsz = offsetofend(struct vfio_device_gfx_plane_info, @@ -1392,6 +1392,8 @@ static long intel_vgpu_ioctl(struct vfio_device *vfio_dev, unsigned int cmd, if (dmabuf.argsz < minsz) return -EINVAL; + minsz = min(minsz, sizeof(dmabuf)); + ret = intel_vgpu_query_plane(vgpu, &dmabuf); if (ret != 0) return ret; diff --git a/samples/vfio-mdev/mbochs.c b/samples/vfio-mdev/mbochs.c index c6c6b5d26670..ee42a780041f 100644 --- a/samples/vfio-mdev/mbochs.c +++ b/samples/vfio-mdev/mbochs.c @@ -1262,7 +1262,7 @@ static long mbochs_ioctl(struct vfio_device *vdev, unsigned int cmd, case VFIO_DEVICE_QUERY_GFX_PLANE: { - struct vfio_device_gfx_plane_info plane; + struct vfio_device_gfx_plane_info plane = {}; minsz = offsetofend(struct vfio_device_gfx_plane_info, region_index); @@ -1273,11 +1273,13 @@ static long mbochs_ioctl(struct vfio_device *vdev, unsigned int cmd, if (plane.argsz < minsz) return -EINVAL; + outsz = min_t(unsigned long, plane.argsz, sizeof(plane)); + ret = mbochs_query_gfx_plane(mdev_state, &plane); if (ret) return ret; - if (copy_to_user((void __user *)arg, &plane, minsz)) + if (copy_to_user((void __user *)arg, &plane, outsz)) return -EFAULT; return 0; diff --git a/samples/vfio-mdev/mdpy.c b/samples/vfio-mdev/mdpy.c index a62ea11e20ec..1500b120de04 100644 --- a/samples/vfio-mdev/mdpy.c +++ b/samples/vfio-mdev/mdpy.c @@ -591,7 +591,7 @@ static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd, case VFIO_DEVICE_QUERY_GFX_PLANE: { - struct vfio_device_gfx_plane_info plane; + struct vfio_device_gfx_plane_info plane = {}; minsz = offsetofend(struct vfio_device_gfx_plane_info, region_index); @@ -602,6 +602,8 @@ static long mdpy_ioctl(struct vfio_device *vdev, unsigned int cmd, if (plane.argsz < minsz) return -EINVAL; + minsz = min_t(unsigned long, plane.argsz, sizeof(plane)); + ret = mdpy_query_gfx_plane(mdev_state, &plane); if (ret) return ret; From patchwork Wed Aug 9 21:02:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 133560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp34234vqi; Wed, 9 Aug 2023 15:04:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGij4/ozmiU01ZnvlhNORcqBVf/KwQh4Pqom0QtunyqS13nDlUGE8Qa1yyiFiY4nwcrn/iP X-Received: by 2002:a05:6e02:1045:b0:348:8050:d7a with SMTP id p5-20020a056e02104500b0034880500d7amr368425ilj.30.1691618692266; Wed, 09 Aug 2023 15:04:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691618692; cv=none; d=google.com; s=arc-20160816; b=A1lrdbuhJSt/LuwN9yqnx54sVaI0YEZBqwaTe5HwZ9HUagUldvmJgkQc7I415b0vz5 pGaqEcGPsqryol8WB+CINzcRjOcnmHXzBtssVpw7PZJ1nV8QDdBYHAUnx+nwO1p6r1k8 nHe3MWBssrr7x0zs/eCr+6709eINzMOIQDLu1A1ZWNiB35zs0gRpCj9r82fz4TjvxEak SS+gecv+b6Ak96lNnT1U6/27Pgl1zqx4yJ0tNf8OmynHnnIroEAlUAXHhkOx4Z4vu6EZ z7QBYZxK95V436gD3syAtvZ0xGm+jqZzF1kdcxEm1AUk9naGvq7b0wq9XrDcNnYup33b N6/A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9Dj3+t39K/qBj5MrzSksnLCUG1VrR0qcfWhwfuxcrlk=; fh=Jwapm4lq68h1feOUtcYIIIrxRv5RQSItvJsoua3O5Rw=; b=atxxsX7pCXtm3gJ2QY7dlDoOUmFQGAgbRVlSptrSqcFapdnk5Gh0qfJRacSXtjH8/P AYKeRJXbRDA3dv2hfX089I/+4CsaDIi/69j+lxkqjRqS7sZjGi6+GDNoLmm7rzYe5+qq BjG/ncpd0cvvZ2xOJQCdZVekrC0PwcqBDa6WZWdag+0igfqmX6ROzjPdKE4U3WGnJMT2 UJnBEm5oaPnhJj/+v4YGsqOqrkwc6r3AYNDa+wz+nIZ3E4bjXj05Qc733Xqc7Dvdq7Xl iAxdvTmb5HO4Xjpt+bf+Wngng9ze1IYK1mvtVIi1KHGSwN+xRzWlqd9qV6udD7qEyr6L 76uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=InSW0MVN; 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 s186-20020a635ec3000000b00553851380besi149974pgb.397.2023.08.09.15.04.06; Wed, 09 Aug 2023 15:04:52 -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=InSW0MVN; 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 S229672AbjHIVE1 (ORCPT + 99 others); Wed, 9 Aug 2023 17:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232473AbjHIVEW (ORCPT ); Wed, 9 Aug 2023 17:04:22 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F57A1BCF for ; Wed, 9 Aug 2023 14:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691615021; 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: in-reply-to:in-reply-to:references:references; bh=9Dj3+t39K/qBj5MrzSksnLCUG1VrR0qcfWhwfuxcrlk=; b=InSW0MVNMNbJd8JwevIdPs3egtpKzcKEOgbj0tEXjgNbsAuAjqgKXvpS3Etq0pPZQg0d2X dm3LHS/vp7KlW+XAHemZEb31m+WUXu5l/52icG9ZcCvihBA0faMBesaPrxqLlgvA6Q2HY/ eX+dZbLn8CVpdrHNmrvrbOFdrUAfgP0= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-696-l9RuCBQtNjyNy_v5wdxC-Q-1; Wed, 09 Aug 2023 17:03:39 -0400 X-MC-Unique: l9RuCBQtNjyNy_v5wdxC-Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 31D3B2999B26; Wed, 9 Aug 2023 21:03:39 +0000 (UTC) Received: from localhost (unknown [10.39.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AC59C15BAE; Wed, 9 Aug 2023 21:03:38 +0000 (UTC) From: Stefan Hajnoczi To: kvm@vger.kernel.org Cc: Jason Gunthorpe , "Tian, Kevin" , linux-kernel@vger.kernel.org, Alex Williamson , Stefan Hajnoczi Subject: [PATCH 3/4] vfio: use __aligned_u64 in struct vfio_iommu_type1_info Date: Wed, 9 Aug 2023 17:02:47 -0400 Message-ID: <20230809210248.2898981-4-stefanha@redhat.com> In-Reply-To: <20230809210248.2898981-1-stefanha@redhat.com> References: <20230809210248.2898981-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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 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: 1773790762109279848 X-GMAIL-MSGID: 1773790762109279848 The memory layout of struct vfio_iommu_type1_info is architecture-dependent due to a u64 field and a struct size that is not a multiple of 8 bytes: - On x86_64 the struct size is padded to a multiple of 8 bytes. - On x32 the struct size is only a multiple of 4 bytes, not 8. - Other architectures may vary. Use __aligned_u64 to make memory layout consistent. This reduces the chance of holes that result in an information leak and the chance that 32-bit userspace on a 64-bit kernel breakage. This patch increases the struct size on x32 but this is safe because of the struct's argsz field. The kernel may grow the struct as long as it still supports smaller argsz values from userspace (e.g. applications compiled against older kernel headers). Suggested-by: Jason Gunthorpe Signed-off-by: Stefan Hajnoczi --- include/uapi/linux/vfio.h | 3 ++- drivers/vfio/vfio_iommu_type1.c | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 45db62d74064..0b5786ec50d8 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -1303,8 +1303,9 @@ struct vfio_iommu_type1_info { __u32 flags; #define VFIO_IOMMU_INFO_PGSIZES (1 << 0) /* supported page sizes info */ #define VFIO_IOMMU_INFO_CAPS (1 << 1) /* Info supports caps */ - __u64 iova_pgsizes; /* Bitmap of supported page sizes */ + __aligned_u64 iova_pgsizes; /* Bitmap of supported page sizes */ __u32 cap_offset; /* Offset within info struct of first cap */ + __u32 reserved; }; /* diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index ebe0ad31d0b0..f51159a7a4de 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -2762,27 +2762,20 @@ static int vfio_iommu_dma_avail_build_caps(struct vfio_iommu *iommu, static int vfio_iommu_type1_get_info(struct vfio_iommu *iommu, unsigned long arg) { - struct vfio_iommu_type1_info info; + struct vfio_iommu_type1_info info = {}; unsigned long minsz; struct vfio_info_cap caps = { .buf = NULL, .size = 0 }; - unsigned long capsz; int ret; minsz = offsetofend(struct vfio_iommu_type1_info, iova_pgsizes); - /* For backward compatibility, cannot require this */ - capsz = offsetofend(struct vfio_iommu_type1_info, cap_offset); - if (copy_from_user(&info, (void __user *)arg, minsz)) return -EFAULT; if (info.argsz < minsz) return -EINVAL; - if (info.argsz >= capsz) { - minsz = capsz; - info.cap_offset = 0; /* output, no-recopy necessary */ - } + minsz = min_t(unsigned long, info.argsz, sizeof(info)); mutex_lock(&iommu->lock); info.flags = VFIO_IOMMU_INFO_PGSIZES; From patchwork Wed Aug 9 21:02:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 133570 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp36196vqi; Wed, 9 Aug 2023 15:08:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFr5gma3KF5Z6MP8/ZYwBREjlczQiUxnO4dgXn/BblukhmGqXgcgrdBGBM84dNWCjQSX1Jr X-Received: by 2002:a17:90b:a4a:b0:263:ff36:3aa0 with SMTP id gw10-20020a17090b0a4a00b00263ff363aa0mr519367pjb.41.1691618889289; Wed, 09 Aug 2023 15:08:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691618889; cv=none; d=google.com; s=arc-20160816; b=PdWaX3n488iZ53s3dz68kCLl5t65xt5SJCjGF85U+ZfsLOuD0OzEd8rCaFzcYiDjQG F8GvXbsDs96hTW456Ieav0IsH3TIOGKLQ8eeJq8vJ0C7O/er/MPk5p3Fx6s5b4piWpJR jmoomS9ZBrva0WQDMAHpiOvumASIm6orMCziL/v4HHi7M8jM2H3bm53PkVWWdi2znoX/ X8Yah7feekYv5I5vdZOFz1VwlzEoiyF4rCJ2wHUTjbZ9TEkid+v1kl9nNKlQOD9srpki Rl/1isWXfACatoNhmMpZLAB1WiLb+RS8RYAtC0AOpIt9qvzBma/FvRGs4jpG9A5N2faA haQw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9pYnh9AZiLo/QufdQ00bPfQxtHLj4posydlYcWhbRmM=; fh=Jwapm4lq68h1feOUtcYIIIrxRv5RQSItvJsoua3O5Rw=; b=WTlM+NJRH8yds9j9BSpFfUuh5/bVd8UbluPOsdBe6v2EOj7JpGPkwHfeNXS3xZaSma uAgpZouJvcs9T7Mqx7h7SEfYADlnn3LGVdZ0kG8X8hlM7EKhlh31rdLyLWM5Qaf32/E4 tcpW2GjfmKpIiF2C86nCyWvtY/+6O34yKKpYs2ZjsSdLBgUX2H8TTOKGTy17tsawXWCp aesmIaB4jN9QnGfG6+Ka9bbTZOjArdpgavHPGmrpVGWqLMn5G8YrZfh+EOhSxKjZkHnk aPTdMURn4Ho4tc1xGHZXEnwWUQyhiJA1uXKXFghZpHVzXlXjLSnwLlDyfOsxT5iKT0cJ /f8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IX6p8bq5; 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 s10-20020a17090a764a00b0026831f63e8csi2283248pjl.52.2023.08.09.15.07.56; Wed, 09 Aug 2023 15:08:09 -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=IX6p8bq5; 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 S232940AbjHIVE4 (ORCPT + 99 others); Wed, 9 Aug 2023 17:04:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229934AbjHIVEx (ORCPT ); Wed, 9 Aug 2023 17:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C7741BFB for ; Wed, 9 Aug 2023 14:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691615026; 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: in-reply-to:in-reply-to:references:references; bh=9pYnh9AZiLo/QufdQ00bPfQxtHLj4posydlYcWhbRmM=; b=IX6p8bq50UKFX0lPwt5fbg+tGPOfgGQbK8MFirGGdJkRlzseRvba0b8WUK8PItSc3ELtUt vAIh/xLmwEAd2H3FjNCoflF1Ve46j9CqKgE47D6t41GEVnCwmaeuJ9Xw0cVzycFSETeM6a s/+4n1BSNExInVL7nq6RfCtChz+o1Bk= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-146-vVAOG69QMN2a86L0HEy8cg-1; Wed, 09 Aug 2023 17:03:43 -0400 X-MC-Unique: vVAOG69QMN2a86L0HEy8cg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA971380673C; Wed, 9 Aug 2023 21:03:41 +0000 (UTC) Received: from localhost (unknown [10.39.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20376C15BAE; Wed, 9 Aug 2023 21:03:40 +0000 (UTC) From: Stefan Hajnoczi To: kvm@vger.kernel.org Cc: Jason Gunthorpe , "Tian, Kevin" , linux-kernel@vger.kernel.org, Alex Williamson , Stefan Hajnoczi Subject: [PATCH 4/4] vfio: use __aligned_u64 in struct vfio_device_ioeventfd Date: Wed, 9 Aug 2023 17:02:48 -0400 Message-ID: <20230809210248.2898981-5-stefanha@redhat.com> In-Reply-To: <20230809210248.2898981-1-stefanha@redhat.com> References: <20230809210248.2898981-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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 autolearn=unavailable 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: 1773790968876070421 X-GMAIL-MSGID: 1773790968876070421 The memory layout of struct vfio_device_ioeventfd is architecture-dependent due to a u64 field and a struct size that is not a multiple of 8 bytes: - On x86_64 the struct size is padded to a multiple of 8 bytes. - On x32 the struct size is only a multiple of 4 bytes, not 8. - Other architectures may vary. Use __aligned_u64 to make memory layout consistent. This reduces the chance of holes that result in an information leak and the chance that 32-bit userspace on a 64-bit kernel breakage. This patch increases the struct size on x32 but this is safe because of the struct's argsz field. The kernel may grow the struct as long as it still supports smaller argsz values from userspace (e.g. applications compiled against older kernel headers). The code that uses struct vfio_device_ioeventfd already works correctly when the struct size grows, so only the struct definition needs to be changed. Suggested-by: Jason Gunthorpe Signed-off-by: Stefan Hajnoczi --- include/uapi/linux/vfio.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 0b5786ec50d8..d61269765bf8 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -794,9 +794,10 @@ struct vfio_device_ioeventfd { #define VFIO_DEVICE_IOEVENTFD_32 (1 << 2) /* 4-byte write */ #define VFIO_DEVICE_IOEVENTFD_64 (1 << 3) /* 8-byte write */ #define VFIO_DEVICE_IOEVENTFD_SIZE_MASK (0xf) - __u64 offset; /* device fd offset of write */ - __u64 data; /* data to be written */ + __aligned_u64 offset; /* device fd offset of write */ + __aligned_u64 data; /* data to be written */ __s32 fd; /* -1 for de-assignment */ + __u32 reserved; }; #define VFIO_DEVICE_IOEVENTFD _IO(VFIO_TYPE, VFIO_BASE + 16)