| Message ID | 20230103234835.never.378-kees@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 54d47689c6e3892ddb24004e07bfcb3f23aa0222 |
| Headers | show |
| Series | [RESEND] drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array | expand |
On Tue, Jan 03, 2023 at 03:48:36PM -0800, Kees Cook wrote: > Zero-length arrays are deprecated[1] and are being replaced with > flexible array members in support of the ongoing efforts to tighten the > FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing > with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3. > > Replace zero-length array with flexible-array member. > > This results in no differences in binary output. > > [1] https://github.com/KSPP/linux/issues/78 > > Cc: Ben Skeggs <bskeggs@redhat.com> > Cc: Karol Herbst <kherbst@redhat.com> > Cc: Lyude Paul <lyude@redhat.com> > Cc: David Airlie <airlied@gmail.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Gourav Samaiya <gsamaiya@nvidia.com> > Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> > Cc: dri-devel@lists.freedesktop.org > Cc: nouveau@lists.freedesktop.org > Signed-off-by: Kees Cook <keescook@chromium.org> Here is my RB again: Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> Thanks! -- Gustavo > --- > Sent before as: https://lore.kernel.org/all/20221118211207.never.039-kees@kernel.org/ > --- > drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > index 8c4cd08a7b5f..8b58b668fc0c 100644 > --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h > +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > @@ -52,7 +52,7 @@ struct nvfw_hs_load_header_v2 { > struct { > u32 offset; > u32 size; > - } app[0]; > + } app[]; > }; > > const struct nvfw_hs_load_header_v2 *nvfw_hs_load_header_v2(struct nvkm_subdev *, const void *); > -- > 2.34.1 >
On Wed, Jan 4, 2023 at 1:52 AM Gustavo A. R. Silva <gustavoars@kernel.org> wrote: > > On Tue, Jan 03, 2023 at 03:48:36PM -0800, Kees Cook wrote: > > Zero-length arrays are deprecated[1] and are being replaced with > > flexible array members in support of the ongoing efforts to tighten the > > FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing > > with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3. > > > > Replace zero-length array with flexible-array member. > > > > This results in no differences in binary output. > > > > [1] https://github.com/KSPP/linux/issues/78 > > > > Cc: Ben Skeggs <bskeggs@redhat.com> > > Cc: Karol Herbst <kherbst@redhat.com> > > Cc: Lyude Paul <lyude@redhat.com> > > Cc: David Airlie <airlied@gmail.com> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Gourav Samaiya <gsamaiya@nvidia.com> > > Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> > > Cc: dri-devel@lists.freedesktop.org > > Cc: nouveau@lists.freedesktop.org > > Signed-off-by: Kees Cook <keescook@chromium.org> > > Here is my RB again: > > Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> > Reviewed-by: Karol Herbst <kherbst@redhat.com> will push in a moment > Thanks! > -- > Gustavo > > > --- > > Sent before as: https://lore.kernel.org/all/20221118211207.never.039-kees@kernel.org/ > > --- > > drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > index 8c4cd08a7b5f..8b58b668fc0c 100644 > > --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > @@ -52,7 +52,7 @@ struct nvfw_hs_load_header_v2 { > > struct { > > u32 offset; > > u32 size; > > - } app[0]; > > + } app[]; > > }; > > > > const struct nvfw_hs_load_header_v2 *nvfw_hs_load_header_v2(struct nvkm_subdev *, const void *); > > -- > > 2.34.1 > > >
On Mon, Jan 16, 2023 at 5:24 PM Karol Herbst <kherbst@redhat.com> wrote: > > On Wed, Jan 4, 2023 at 1:52 AM Gustavo A. R. Silva > <gustavoars@kernel.org> wrote: > > > > On Tue, Jan 03, 2023 at 03:48:36PM -0800, Kees Cook wrote: > > > Zero-length arrays are deprecated[1] and are being replaced with > > > flexible array members in support of the ongoing efforts to tighten the > > > FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing > > > with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3. > > > > > > Replace zero-length array with flexible-array member. > > > > > > This results in no differences in binary output. > > > > > > [1] https://github.com/KSPP/linux/issues/78 > > > > > > Cc: Ben Skeggs <bskeggs@redhat.com> > > > Cc: Karol Herbst <kherbst@redhat.com> > > > Cc: Lyude Paul <lyude@redhat.com> > > > Cc: David Airlie <airlied@gmail.com> > > > Cc: Daniel Vetter <daniel@ffwll.ch> > > > Cc: Gourav Samaiya <gsamaiya@nvidia.com> > > > Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> > > > Cc: dri-devel@lists.freedesktop.org > > > Cc: nouveau@lists.freedesktop.org > > > Signed-off-by: Kees Cook <keescook@chromium.org> > > > > Here is my RB again: > > > > Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> > > > > Reviewed-by: Karol Herbst <kherbst@redhat.com> > > will push in a moment > just noticed it's the same change than the other one... anyway, will push the oldest one > > Thanks! > > -- > > Gustavo > > > > > --- > > > Sent before as: https://lore.kernel.org/all/20221118211207.never.039-kees@kernel.org/ > > > --- > > > drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > > index 8c4cd08a7b5f..8b58b668fc0c 100644 > > > --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > > +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > > @@ -52,7 +52,7 @@ struct nvfw_hs_load_header_v2 { > > > struct { > > > u32 offset; > > > u32 size; > > > - } app[0]; > > > + } app[]; > > > }; > > > > > > const struct nvfw_hs_load_header_v2 *nvfw_hs_load_header_v2(struct nvkm_subdev *, const void *); > > > -- > > > 2.34.1 > > > > >
Hi! Sorry for the late response, I've had my head buried in some regressions from AMD for a while now and am now just catching up on my email. Does this still need to be pushed upstream? On Tue, 2023-01-03 at 18:52 -0600, Gustavo A. R. Silva wrote: > On Tue, Jan 03, 2023 at 03:48:36PM -0800, Kees Cook wrote: > > Zero-length arrays are deprecated[1] and are being replaced with > > flexible array members in support of the ongoing efforts to tighten the > > FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing > > with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3. > > > > Replace zero-length array with flexible-array member. > > > > This results in no differences in binary output. > > > > [1] https://github.com/KSPP/linux/issues/78 > > > > Cc: Ben Skeggs <bskeggs@redhat.com> > > Cc: Karol Herbst <kherbst@redhat.com> > > Cc: Lyude Paul <lyude@redhat.com> > > Cc: David Airlie <airlied@gmail.com> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Gourav Samaiya <gsamaiya@nvidia.com> > > Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> > > Cc: dri-devel@lists.freedesktop.org > > Cc: nouveau@lists.freedesktop.org > > Signed-off-by: Kees Cook <keescook@chromium.org> > > Here is my RB again: > > Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org> > > Thanks! > -- > Gustavo > > > --- > > Sent before as: https://lore.kernel.org/all/20221118211207.never.039-kees@kernel.org/ > > --- > > drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > index 8c4cd08a7b5f..8b58b668fc0c 100644 > > --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h > > @@ -52,7 +52,7 @@ struct nvfw_hs_load_header_v2 { > > struct { > > u32 offset; > > u32 size; > > - } app[0]; > > + } app[]; > > }; > > > > const struct nvfw_hs_load_header_v2 *nvfw_hs_load_header_v2(struct nvkm_subdev *, const void *); > > -- > > 2.34.1 > > >
diff --git a/drivers/gpu/drm/nouveau/include/nvfw/hs.h b/drivers/gpu/drm/nouveau/include/nvfw/hs.h index 8c4cd08a7b5f..8b58b668fc0c 100644 --- a/drivers/gpu/drm/nouveau/include/nvfw/hs.h +++ b/drivers/gpu/drm/nouveau/include/nvfw/hs.h @@ -52,7 +52,7 @@ struct nvfw_hs_load_header_v2 { struct { u32 offset; u32 size; - } app[0]; + } app[]; }; const struct nvfw_hs_load_header_v2 *nvfw_hs_load_header_v2(struct nvkm_subdev *, const void *);
Zero-length arrays are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3. Replace zero-length array with flexible-array member. This results in no differences in binary output. [1] https://github.com/KSPP/linux/issues/78 Cc: Ben Skeggs <bskeggs@redhat.com> Cc: Karol Herbst <kherbst@redhat.com> Cc: Lyude Paul <lyude@redhat.com> Cc: David Airlie <airlied@gmail.com> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Gourav Samaiya <gsamaiya@nvidia.com> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Signed-off-by: Kees Cook <keescook@chromium.org> --- Sent before as: https://lore.kernel.org/all/20221118211207.never.039-kees@kernel.org/ --- drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)