On Fri, 25 Apr 2025, Kees Cook <[email protected]> wrote: > In preparation for making the kmalloc family of allocators type aware, > we need to make sure that the returned type from the allocation matches > the type of the variable being assigned. (Before, the allocator would > always return "void *", which can be implicitly cast to any pointer type.) > > The assigned type is "struct i915_wa *". The returned type, while > technically matching, will be const qualified. As there is no general > way to remove const qualifiers, adjust the allocation type to match > the assignment. > > Signed-off-by: Kees Cook <[email protected]>
Acked-by: Jani Nikula <[email protected]> for merging via whichever tree you find best; please let us know if you want us to pick this up via drm-intel. > --- > Cc: Jani Nikula <[email protected]> > Cc: Joonas Lahtinen <[email protected]> > Cc: Rodrigo Vivi <[email protected]> > Cc: Tvrtko Ursulin <[email protected]> > Cc: David Airlie <[email protected]> > Cc: Simona Vetter <[email protected]> > Cc: Matt Roper <[email protected]> > Cc: Gustavo Sousa <[email protected]> > Cc: Andi Shyti <[email protected]> > Cc: Lucas De Marchi <[email protected]> > Cc: <[email protected]> > Cc: <[email protected]> > --- > drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c > b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 116683ebe074..b37e400f74e5 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -156,7 +156,7 @@ static void _wa_add(struct i915_wa_list *wal, const > struct i915_wa *wa) > if (IS_ALIGNED(wal->count, grow)) { /* Either uninitialized or full. */ > struct i915_wa *list; > > - list = kmalloc_array(ALIGN(wal->count + 1, grow), sizeof(*wa), > + list = kmalloc_array(ALIGN(wal->count + 1, grow), sizeof(*list), > GFP_KERNEL); > if (!list) { > drm_err(&i915->drm, "No space for workaround init!\n"); -- Jani Nikula, Intel
