forked from luck/tmp_suning_uos_patched
0d96687213
Commit9495b7e92f("driver core: platform: Initialize dma_parms for platform devices") in v5.7-rc5 causes vb2_dma_contig_clear_max_seg_size() to kfree memory that was not allocated by vb2_dma_contig_set_max_seg_size(). The assumption in vb2_dma_contig_set_max_seg_size() seems to be that dev->dma_parms is always NULL when the driver is probed, and the case where dev->dma_parms has bee initialized by someone else than the driver (by calling vb2_dma_contig_set_max_seg_size) will cause a failure. All the current users of these functions are platform devices, which now always have dma_parms set by the driver core. To fix the issue for v5.7, make vb2_dma_contig_set_max_seg_size() return an error if dma_parms is NULL to be on the safe side, and remove the kfree code from vb2_dma_contig_clear_max_seg_size(). For v5.8 we should remove the two functions and move the dma_set_max_seg_size() calls into the drivers. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Fixes:9495b7e92f("driver core: platform: Initialize dma_parms for platform devices") Cc: stable@vger.kernel.org Acked-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
33 lines
883 B
C
33 lines
883 B
C
/*
|
|
* videobuf2-dma-contig.h - DMA contig memory allocator for videobuf2
|
|
*
|
|
* Copyright (C) 2010 Samsung Electronics
|
|
*
|
|
* Author: Pawel Osciak <pawel@osciak.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation.
|
|
*/
|
|
|
|
#ifndef _MEDIA_VIDEOBUF2_DMA_CONTIG_H
|
|
#define _MEDIA_VIDEOBUF2_DMA_CONTIG_H
|
|
|
|
#include <media/videobuf2-v4l2.h>
|
|
#include <linux/dma-mapping.h>
|
|
|
|
static inline dma_addr_t
|
|
vb2_dma_contig_plane_dma_addr(struct vb2_buffer *vb, unsigned int plane_no)
|
|
{
|
|
dma_addr_t *addr = vb2_plane_cookie(vb, plane_no);
|
|
|
|
return *addr;
|
|
}
|
|
|
|
int vb2_dma_contig_set_max_seg_size(struct device *dev, unsigned int size);
|
|
static inline void vb2_dma_contig_clear_max_seg_size(struct device *dev) { }
|
|
|
|
extern const struct vb2_mem_ops vb2_dma_contig_memops;
|
|
|
|
#endif
|