Date: Fri, 22 Sep 2023 20:36:48 -0600
From: "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To: Kees Cook <keescook@...omium.org>, David Airlie <airlied@...il.com>
Cc: David Airlie <airlied@...hat.com>, Gerd Hoffmann <kraxel@...hat.com>,
 Gurchetan Singh <gurchetansingh@...omium.org>, Chia-I Wu
 <olvaffe@...il.com>, Daniel Vetter <daniel@...ll.ch>,
 dri-devel@...ts.freedesktop.org, virtualization@...ts.linux-foundation.org,
 Emma Anholt <emma@...olt.net>, Evan Quan <evan.quan@....com>,
 Alex Deucher <alexander.deucher@....com>,
 Christian König <christian.koenig@....com>,
 "Pan, Xinhui" <Xinhui.Pan@....com>, Xiaojian Du <Xiaojian.Du@....com>,
 Huang Rui <ray.huang@....com>, Kevin Wang <kevin1.wang@....com>,
 Hawking Zhang <Hawking.Zhang@....com>,
 Jani Nikula <jani.nikula@...ux.intel.com>,
 Joonas Lahtinen <joonas.lahtinen@...ux.intel.com>,
 Rodrigo Vivi <rodrigo.vivi@...el.com>,
 Tvrtko Ursulin <tvrtko.ursulin@...ux.intel.com>,
 Chris Wilson <chris@...is-wilson.co.uk>,
 John Harrison <john.c.harrison@...el.com>,
 Andi Shyti <andi.shyti@...ux.intel.com>,
 Matthew Brost <matthew.brost@...el.com>, Rob Clark <robdclark@...il.com>,
 Abhinav Kumar <quic_abhinavk@...cinc.com>,
 Dmitry Baryshkov <dmitry.baryshkov@...aro.org>, Sean Paul <sean@...rly.run>,
 Marijn Suijten <marijn.suijten@...ainline.org>,
 Bjorn Andersson <andersson@...nel.org>, Ben Skeggs <bskeggs@...hat.com>,
 Karol Herbst <kherbst@...hat.com>, Lyude Paul <lyude@...hat.com>,
 Maxime Ripard <mripard@...nel.org>, Zack Rusin <zackr@...are.com>,
 VMware Graphics Reviewers <linux-graphics-maintainer@...are.com>,
 Melissa Wen <mwen@...lia.com>, Nathan Chancellor <nathan@...nel.org>,
 Nick Desaulniers <ndesaulniers@...gle.com>, Tom Rix <trix@...hat.com>,
 Le Ma <le.ma@....com>, Lijo Lazar <lijo.lazar@....com>,
 Yifan Zhang <yifan1.zhang@....com>, Prike Liang <Prike.Liang@....com>,
 Lang Yu <Lang.Yu@....com>, Tejas Upadhyay <tejas.upadhyay@...el.com>,
 Nirmoy Das <nirmoy.das@...el.com>, Andrzej Hajda <andrzej.hajda@...el.com>,
 Neil Armstrong <neil.armstrong@...aro.org>,
 Kuogee Hsieh <quic_khsieh@...cinc.com>, linux-kernel@...r.kernel.org,
 amd-gfx@...ts.freedesktop.org, intel-gfx@...ts.freedesktop.org,
 linux-arm-msm@...r.kernel.org, freedreno@...ts.freedesktop.org,
 nouveau@...ts.freedesktop.org, llvm@...ts.linux.dev,
 linux-hardening@...r.kernel.org
Subject: Re: [PATCH 7/9] drm/virtio: Annotate struct virtio_gpu_object_array
 with __counted_by



On 9/22/23 11:32, Kees Cook wrote:
> Prepare for the coming implementation by GCC and Clang of the __counted_by
> attribute. Flexible array members annotated with __counted_by can have
> their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
> (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
> functions).
> 
> As found with Coccinelle[1], add __counted_by for struct virtio_gpu_object_array.
> 
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
> 
> Cc: David Airlie <airlied@...hat.com>
> Cc: Gerd Hoffmann <kraxel@...hat.com>
> Cc: Gurchetan Singh <gurchetansingh@...omium.org>
> Cc: Chia-I Wu <olvaffe@...il.com>
> Cc: Daniel Vetter <daniel@...ll.ch>
> Cc: dri-devel@...ts.freedesktop.org
> Cc: virtualization@...ts.linux-foundation.org
> Signed-off-by: Kees Cook <keescook@...omium.org>

Reviewed-by: Gustavo A. R. Silva <gustavoars@...nel.org>

Thanks
-- 
Gustavo

> ---
>   drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
> index 8513b671f871..96365a772f77 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_drv.h
> +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
> @@ -119,7 +119,7 @@ struct virtio_gpu_object_array {
>   	struct ww_acquire_ctx ticket;
>   	struct list_head next;
>   	u32 nents, total;
> -	struct drm_gem_object *objs[];
> +	struct drm_gem_object *objs[] __counted_by(total);
>   };
>   
>   struct virtio_gpu_vbuffer;

Powered by blists - more mailing lists