Am 15.12.20 um 04:04 schrieb Andrew Morton: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Subject: dma-buf: use krealloc_array() > > Use the helper that checks for overflows internally instead of manually > calculating the size of the new array. > > Link: https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flkml.kernel.org%2Fr%2F20201109110654.12547-10-brgl%40bgdev.pl&data=04%7C01%7Cchristian.koenig%40amd.com%7C6b47239993c14bae4a2608d8a0a622ec%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637435982788605958%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=nXA6nN0XwBzItUWV8izu5MEsUboZ8dSJUr88geKWsuY%3D&reserved=0 > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > Acked-by: Christian König <christian.koenig@amd.com> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Borislav Petkov <bp@alien8.de> > Cc: Borislav Petkov <bp@suse.de> > Cc: Christoph Lameter <cl@linux.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: David Airlie <airlied@linux.ie> > Cc: David Rientjes <rientjes@google.com> > Cc: Gustavo Padovan <gustavo@padovan.org> > Cc: James Morse <james.morse@arm.com> > Cc: Jaroslav Kysela <perex@perex.cz> > Cc: Jason Wang <jasowang@redhat.com> > Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> > Cc: Linus Walleij <linus.walleij@linaro.org> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: Maxime Ripard <mripard@kernel.org> > Cc: "Michael S . Tsirkin" <mst@redhat.com> > Cc: Pekka Enberg <penberg@kernel.org> > Cc: Robert Richter <rric@kernel.org> > Cc: Sumit Semwal <sumit.semwal@linaro.org> > Cc: Takashi Iwai <tiwai@suse.com> > Cc: Takashi Iwai <tiwai@suse.de> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Tony Luck <tony.luck@intel.com> > Cc: Vlastimil Babka <vbabka@suse.cz> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Christian König <christian.koenig@amd.com> > --- > > drivers/dma-buf/sync_file.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > --- a/drivers/dma-buf/sync_file.c~dma-buf-use-krealloc_array > +++ a/drivers/dma-buf/sync_file.c > @@ -270,8 +270,7 @@ static struct sync_file *sync_file_merge > fences[i++] = dma_fence_get(a_fences[0]); > > if (num_fences > i) { > - nfences = krealloc(fences, i * sizeof(*fences), > - GFP_KERNEL); > + nfences = krealloc_array(fences, i, sizeof(*fences), GFP_KERNEL); > if (!nfences) > goto err; > > _
--- a/drivers/dma-buf/sync_file.c~dma-buf-use-krealloc_array +++ a/drivers/dma-buf/sync_file.c @@ -270,8 +270,7 @@ static struct sync_file *sync_file_merge fences[i++] = dma_fence_get(a_fences[0]); if (num_fences > i) { - nfences = krealloc(fences, i * sizeof(*fences), - GFP_KERNEL); + nfences = krealloc_array(fences, i, sizeof(*fences), GFP_KERNEL); if (!nfences) goto err;