]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: atomisp: Add check for rgby_data memory allocation failure
authorLi Huafei <lihuafei1@huawei.com>
Mon, 4 Nov 2024 14:50:51 +0000 (22:50 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:50:51 +0000 (19:50 +0100)
[ Upstream commit ed61c59139509f76d3592683c90dc3fdc6e23cd6 ]

In ia_css_3a_statistics_allocate(), there is no check on the allocation
result of the rgby_data memory. If rgby_data is not successfully
allocated, it may trigger the assert(host_stats->rgby_data) assertion in
ia_css_s3a_hmem_decode(). Adding a check to fix this potential issue.

Fixes: a49d25364dfb ("staging/atomisp: Add support for the Intel IPU v2")
Signed-off-by: Li Huafei <lihuafei1@huawei.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20241104145051.3088231-1-lihuafei1@huawei.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/media/atomisp/pci/sh_css_params.c

index 013eac639f66962e6487583b03626ad05c0497e6..85cf280bd12a867cbb7d8adcc6ae17ea4a9a809d 100644 (file)
@@ -4335,6 +4335,8 @@ ia_css_3a_statistics_allocate(const struct ia_css_3a_grid_info *grid)
                goto err;
        /* No weighted histogram, no structure, treat the histogram data as a byte dump in a byte array */
        me->rgby_data = kvmalloc(sizeof_hmem(HMEM0_ID), GFP_KERNEL);
+       if (!me->rgby_data)
+               goto err;
 
        IA_CSS_LEAVE("return=%p", me);
        return me;