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

Commit bac8b847 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Greg Kroah-Hartman
Browse files

media: c8sectpfe: fix potential NULL pointer dereference in c8sectpfe_timer_interrupt 




[ Upstream commit baed3c4bc4c13de93e0dba0a26d601411ebcb389 ]

_channel_ is being dereferenced before it is null checked, hence there is a
potential null pointer dereference. Fix this by moving the pointer dereference
after _channel_ has been null checked.

This issue was detected with the help of Coccinelle.

Fixes: c5f5d0f9 ("[media] c8sectpfe: STiH407/10 Linux DVB demux support")

Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Acked-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dadb6c1a

drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c

+3 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void c8sectpfe_timer_interrupt(unsigned long ac8sectpfei) 
static void channel_swdemux_tsklet(unsigned long data)

{

	struct channel_info *channel = (struct channel_info *)data;

	struct c8sectpfei *fei = channel->fei;

	struct c8sectpfei *fei;

	unsigned long wp, rp;

	int pos, num_packets, n, size;

	u8 *buf;
@@ -91,6 +91,8 @@ static void channel_swdemux_tsklet(unsigned long data) 
	if (unlikely(!channel || !channel->irec))

		return;



	fei = channel->fei;



	wp = readl(channel->irec + DMA_PRDS_BUSWP_TP(0));

	rp = readl(channel->irec + DMA_PRDS_BUSRP_TP(0));