Web lists-archives.com

[PATCH 4.9 012/171] soc: fsl: qbman: qman: avoid allocating from non existing gen_pool

4.9-stable review patch.  If anyone has any objections, please let me know.


[ 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

Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
Reviewed-by: Roy Pledge <roy.pledge@xxxxxxx>
Signed-off-by: Li Yang <leoyang.li@xxxxxxx>
(cherry picked from commit f72487a2788aa70c3aee1d0ebd5470de9bac953a)
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
 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;