net/wan/fsl_ucc_hdlc: reject muram offsets above 64K
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Thu, 28 Nov 2019 14:55:51 +0000 (15:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 28 Feb 2020 14:42:23 +0000 (15:42 +0100)
[ Upstream commit 148587a59f6b85831695e0497d9dd1af5f0495af ]

Qiang Zhao points out that these offsets get written to 16-bit
registers, and there are some QE platforms with more than 64K
muram. So it is possible that qe_muram_alloc() gives us an allocation
that can't actually be used by the hardware, so detect and reject
that.

Reported-by: Qiang Zhao <qiang.zhao@nxp.com>
Reviewed-by: Timur Tabi <timur@kernel.org>
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wan/fsl_ucc_hdlc.c

index af85a1b3135e2cead207757edbc9018cfa082c0e..87bf05a81db50f88f07b2a2eb1f56d5d4f3d506c 100644 (file)
@@ -209,6 +209,11 @@ static int uhdlc_init(struct ucc_hdlc_private *priv)
                ret = -ENOMEM;
                goto free_riptr;
        }
+       if (riptr != (u16)riptr || tiptr != (u16)tiptr) {
+               dev_err(priv->dev, "MURAM allocation out of addressable range\n");
+               ret = -ENOMEM;
+               goto free_tiptr;
+       }
 
        /* Set RIPTR, TIPTR */
        iowrite16be(riptr, &priv->ucc_pram->riptr);