• Kees Cook's avatar
    media: omap3isp: Use struct_group() for memcpy() region · d4568fc8
    Kees Cook authored
    In preparation for FORTIFY_SOURCE performing compile-time and run-time
    field bounds checking for memcpy(), memmove(), and memset(), avoid
    intentionally writing across neighboring fields. Wrap the target region
    in struct_group(). This additionally fixes a theoretical misalignment
    of the copy (since the size of "buf" changes between 64-bit and 32-bit,
    but this is likely never built for 64-bit).
    
    FWIW, I think this code is totally broken on 64-bit (which appears to
    not be a "real" build configuration): it would either always fail (with
    an uninitialized data->buf_size) or would cause corruption in userspace
    due to the copy_to_user() in the call path against an uninitialized
    data->buf value:
    
    omap3isp_stat_request_statistics_time32(...)
        struct omap3isp_stat_data data64;
        ...
        omap3isp_stat_request_statistics(stat, &data64);
    
    int omap3isp_stat_request_statistics(struct ispstat *stat,
                                         struct omap3isp_stat_data *data)
        ...
        buf = isp_stat_buf_get(stat, data);
    
    static struct ispstat_buffer *isp_stat_buf_get(struct ispstat *stat,
                                                   struct omap3isp_stat_data *data)
    ...
        if (buf->buf_size > data->buf_size) {
                ...
                return ERR_PTR(-EINVAL);
        }
        ...
        rval = copy_to_user(data->buf,
                            buf->virt_addr,
                            buf->buf_size);
    
    Regardless, additionally initialize data64 to be zero-filled to avoid
    undefined behavior.
    
    Link: https://lore.kernel.org/lkml/20211215220505.GB21862@embeddedor
    
    Cc: Arnd Bergmann <arnd@arndb.de>
    Fixes: 378e3f81 ("media: omap3isp: support 64-bit version of omap3isp_stat_data")
    Cc: stable@vger.kernel.org
    Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
    Signed-off-by: default avatarKees Cook <keescook@chromium.org>
    Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
    d4568fc8
omap3isp.h 20.9 KB