media: c8sectpfe: fix potential NULL pointer dereference in c8sectpfe_timer_interrupt

BugLink: http://bugs.launchpad.net/bugs/1758886
[ 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: c5f5d0f99794 ("[media] c8sectpfe: STiH407/10 Linux DVB demux support")
Signed-off-by: Gustavo A. R. Silva <garsilva@embeddedor.com>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index a0acee7671b16170ab9f19f430349d1aec00aeba..8bd19e61846d796f9802b7966e101a3578fc5608 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -83,7 +83,7 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t)
 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));