wan/fsl_ucc_hdlc: avoid possible NULL pointer dereference
authorxypron.glpk@gmx.de <xypron.glpk@gmx.de>
Sun, 31 Jul 2016 11:14:23 +0000 (13:14 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 1 Aug 2016 20:32:52 +0000 (13:32 -0700)
All assignments to components of priv should only
occur after the check if prif is NULL.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/fsl_ucc_hdlc.c

index 2fc50ec453d05c369c4702b6a3f73e2e0095134a..6f044450b7024a359ef5a06a51407d81578aeb17 100644 (file)
@@ -862,7 +862,7 @@ static int uhdlc_suspend(struct device *dev)
 static int uhdlc_resume(struct device *dev)
 {
        struct ucc_hdlc_private *priv = dev_get_drvdata(dev);
-       struct ucc_tdm *utdm = priv->utdm;
+       struct ucc_tdm *utdm;
        struct ucc_tdm_info *ut_info;
        struct ucc_fast __iomem *uf_regs;
        struct ucc_fast_private *uccf;
@@ -877,6 +877,7 @@ static int uhdlc_resume(struct device *dev)
        if (!netif_running(priv->ndev))
                return 0;
 
+       utdm = priv->utdm;
        ut_info = priv->ut_info;
        uf_info = &ut_info->uf_info;
        uf_regs = priv->uf_regs;