Commit 7821bcce authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman
Browse files

media: s5p-mfc: fix incorrect bus assignment in virtual child device 



[ Upstream commit 1e0d0a5f ]

Virtual MFC codec's child devices must not be assigned to platform bus,
because they are allocated as raw 'struct device' and don't have the
corresponding 'platform' part. This fixes NULL pointer access revealed
recently by commit a66d9724 ("devres: Align data[] to
ARCH_KMALLOC_MINALIGN").

Fixes: c79667dd ("media: s5p-mfc: replace custom reserved memory handling code with generic one")

Reported-by: default avatarPaweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarPaweł Chmiel <pawel.mikolaj.chmiel@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3ddc2a10

drivers/media/platform/s5p-mfc/s5p_mfc.c

+0 −1
Original line number Diff line number Diff line
@@ -1089,7 +1089,6 @@ static struct device *s5p_mfc_alloc_memdev(struct device *dev, 
	device_initialize(child);

	dev_set_name(child, "%s:%s", dev_name(dev), name);

	child->parent = dev;

	child->bus = dev->bus;

	child->coherent_dma_mask = dev->coherent_dma_mask;

	child->dma_mask = dev->dma_mask;

	child->release = s5p_mfc_memdev_release;