Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 385963f4 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Greg Kroah-Hartman
Browse files

drm/omap: fix possible NULL ref issue in tiler_reserve_2d 



[ Upstream commit 6a0f0c55619f0b82a677cab72e77c3444a5eee58 ]

tiler_reserve_2d allocates memory but does not check if it got the
memory. Add the check and return ENOMEM on failure.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180329104038.29154-2-tomi.valkeinen@ti.com


Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cbbc5cd1

drivers/gpu/drm/omapdrm/omap_dmm_tiler.c

+5 −1
Original line number Diff line number Diff line
@@ -356,11 +356,15 @@ int tiler_unpin(struct tiler_block *block) 
struct tiler_block *tiler_reserve_2d(enum tiler_fmt fmt, uint16_t w,

		uint16_t h, uint16_t align)

{

	struct tiler_block *block = kzalloc(sizeof(*block), GFP_KERNEL);

	struct tiler_block *block;

	u32 min_align = 128;

	int ret;

	unsigned long flags;



	block = kzalloc(sizeof(*block), GFP_KERNEL);

	if (!block)

		return ERR_PTR(-ENOMEM);



	BUG_ON(!validfmt(fmt));



	/* convert width/height to slots */