| From e7b53b5630d7bfbbd3becb928e4df7f5d1d14594 Mon Sep 17 00:00:00 2001 |
| From: Alexandre Belloni <alexandre.belloni@bootlin.com> |
| Date: Thu, 23 Aug 2018 23:36:00 +0200 |
| Subject: soc: fsl: qbman: qman: avoid allocating from non existing gen_pool |
| |
| [ Upstream commit 64e9e22e68512da8df3c9a7430f07621e48db3c2 ] |
| |
| If the qman driver didn't probe, calling qman_alloc_fqid_range, |
| qman_alloc_pool_range or qman_alloc_cgrid_range (as done in dpaa_eth) will |
| pass a NULL pointer to gen_pool_alloc, leading to a NULL pointer |
| dereference. |
| |
| Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> |
| Reviewed-by: Roy Pledge <roy.pledge@nxp.com> |
| Signed-off-by: Li Yang <leoyang.li@nxp.com> |
| (cherry picked from commit f72487a2788aa70c3aee1d0ebd5470de9bac953a) |
| Signed-off-by: Olof Johansson <olof@lixom.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/soc/fsl/qbman/qman.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c |
| index 2caacd9d2526..2cc82ed6433a 100644 |
| --- a/drivers/soc/fsl/qbman/qman.c |
| +++ b/drivers/soc/fsl/qbman/qman.c |
| @@ -2713,6 +2713,9 @@ static int qman_alloc_range(struct gen_pool *p, u32 *result, u32 cnt) |
| { |
| unsigned long addr; |
| |
| + if (!p) |
| + return -ENODEV; |
| + |
| addr = gen_pool_alloc(p, cnt); |
| if (!addr) |
| return -ENOMEM; |
| -- |
| 2.17.1 |
| |