| Message ID | 20180823213600.23426-2-alexandre.belloni@bootlin.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/2] soc: fsl: qbman: qman_portal: defer probing when qman is not available | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
| snowpatch_ozlabs/checkpatch | success | Test checkpatch on branch next |
| snowpatch_ozlabs/build-ppc64le | success | Test build-ppc64le on branch next |
| snowpatch_ozlabs/build-ppc64be | success | Test build-ppc64be on branch next |
| snowpatch_ozlabs/build-ppc64e | success | Test build-ppc64e on branch next |
| snowpatch_ozlabs/build-ppc32 | success | Test build-ppc32 on branch next |
On 8/23/2018 5:36 PM, Alexandre Belloni wrote: > 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> > --- > 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 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) > { > unsigned long addr; > > + if (!p) > + return -ENODEV; > + > addr = gen_pool_alloc(p, cnt); > if (!addr) > return -ENOMEM; Reviewed-by: Roy Pledge <roy.pledge@nxp.com>
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) { unsigned long addr; + if (!p) + return -ENODEV; + addr = gen_pool_alloc(p, cnt); if (!addr) return -ENOMEM;
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> --- drivers/soc/fsl/qbman/qman.c | 3 +++ 1 file changed, 3 insertions(+)