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 24F00C04A94 for ; Mon, 14 Aug 2023 17:51:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231370AbjHNRvF (ORCPT ); Mon, 14 Aug 2023 13:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231535AbjHNRuv (ORCPT ); Mon, 14 Aug 2023 13:50:51 -0400 Received: from mail-vk1-xa31.google.com (mail-vk1-xa31.google.com [IPv6:2607:f8b0:4864:20::a31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FCB310E3 for ; Mon, 14 Aug 2023 10:50:42 -0700 (PDT) Received: by mail-vk1-xa31.google.com with SMTP id 71dfb90a1353d-4871beff078so1229437e0c.0 for ; Mon, 14 Aug 2023 10:50:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; t=1692035441; x=1692640241; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=LLZ589XCwkf4jjhp9SGI7jmX+IpjbGu8OredhPvpDG4=; b=cfDI+oScTaafpm7QXJOik0O50amrmcmILuBuV4iJnQAtEaL2OOnHiOJ8Um2zrO74b9 xTNpoyzc3JuYcwHN3m+UddWP3/jNbryhMFdLKsYvP3U0pp9w0AVkkW0rnVl8w/Dg/ys1 rjqRNsSicNb9cNnTltdowdw2L6KXR05Mr/bKm7UEpwZXPmxe78d873u7Y+H0xko3se9n UCfgq/maRa37sI6seG7bZN1b7uqWMOZmWZc9ZKghqTQdJOXqx1jdvzh+9t2hbTA8X7vq 4y+gejDx9FRkckjSh9M/HZBP53wzoQNEgHSYzvQr6BpzGXuTlSvDmkWtv913C0ouPbK0 +vGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692035441; x=1692640241; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LLZ589XCwkf4jjhp9SGI7jmX+IpjbGu8OredhPvpDG4=; b=HUyvTONNE5GjwSfCJsAt1XJDZkAhU3FErgXCXCFCyaRa1SV1lGx/LGmeMCBQ9YJCM4 KVMedJ3YKRWI/AV31wpBlufSz7v7F5FziP1zvGKy7CLXMFAN5mVExXzQ0PwhL7S2Wer0 zFmGduqyKIh4972bNtkJSkJE6qtIZbS1r2tfkKddvQkEa61b1XppNCO7lrqWtYcMQChR mY/b4998N+r9KXfOV3l66Js3Zb8Vhoogaf25MIOMb9pb+DyVYMHrAZlzigfcBiOqUG0y 3NX+6KDI00r6uFnYB+LO0hjNMX4ZBdx/NS6MwVtnKDFXuJT5CjMAFII1OTDKkqNi0HOT rJtQ== X-Gm-Message-State: AOJu0Yx7vTwoh70DXkH5RxMQwa13B1lOUb+zz8mI8uFcnQIjGh6wIr42 upY3LDvTlm9NQqoj3IgBfAOAo6EE1C6ZSYPDmNo= X-Google-Smtp-Source: AGHT+IEoeSctuk1Pw0nVc+RaQnZY+V4fEKNljRLyAyTqtAoR5S/yEFwk38vJiT+3M//xOF1Cy9nwiA== X-Received: by 2002:a1f:c190:0:b0:487:192c:ebbe with SMTP id r138-20020a1fc190000000b00487192cebbemr8785110vkf.10.1692035441613; Mon, 14 Aug 2023 10:50:41 -0700 (PDT) Received: from ziepe.ca ([206.223.160.26]) by smtp.gmail.com with ESMTPSA id r6-20020a0ccc06000000b0063d4e41d9adsm3464184qvk.106.2023.08.14.10.50.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 10:50:41 -0700 (PDT) Received: from jgg by wakko with local (Exim 4.95) (envelope-from ) id 1qVbiC-0070DY-6R; Mon, 14 Aug 2023 14:50:40 -0300 Date: Mon, 14 Aug 2023 14:50:40 -0300 From: Jason Gunthorpe To: Stefan Hajnoczi Cc: kvm@vger.kernel.org, "Tian, Kevin" , linux-kernel@vger.kernel.org, Alex Williamson Subject: Re: [PATCH 2/4] vfio: use __aligned_u64 in struct vfio_device_gfx_plane_info Message-ID: References: <20230809210248.2898981-1-stefanha@redhat.com> <20230809210248.2898981-3-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230809210248.2898981-3-stefanha@redhat.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 09, 2023 at 05:02:46PM -0400, Stefan Hajnoczi wrote: > 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)); > + Huh? minsz = min(sizeof(dmabuf), dmabuf.argsz) > 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)); > + This one is right Jason