diff options
author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-08-23 17:36:00 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-09-25 16:57:25 -0400 |
commit | 64e9e22e68512da8df3c9a7430f07621e48db3c2 (patch) | |
tree | 584df8f3b1e15ed9103c26cd146be64b83e8fbef | |
parent | 1a677ff4ce6acc3bdb2d01bb25eb687a6e28aa1d (diff) |
soc: fsl: qbman: qman: avoid allocating from non existing gen_pool
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>
-rw-r--r-- | drivers/soc/fsl/qbman/qman.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index ecb22749df0b..8cc015183043 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c | |||
@@ -2729,6 +2729,9 @@ static int qman_alloc_range(struct gen_pool *p, u32 *result, u32 cnt) | |||
2729 | { | 2729 | { |
2730 | unsigned long addr; | 2730 | unsigned long addr; |
2731 | 2731 | ||
2732 | if (!p) | ||
2733 | return -ENODEV; | ||
2734 | |||
2732 | addr = gen_pool_alloc(p, cnt); | 2735 | addr = gen_pool_alloc(p, cnt); |
2733 | if (!addr) | 2736 | if (!addr) |
2734 | return -ENOMEM; | 2737 | return -ENOMEM; |