| Message ID | 62835c16-c85c-483d-a8fe-63be78d49d15@moroto.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/panthor: Fix off by one in panthor_fw_get_cs_iface() | expand |
On Tue, 2 Apr 2024 12:56:42 +0300 Dan Carpenter <dan.carpenter@linaro.org> wrote: > The ->iface.streams[csg_slot][] array has MAX_CS_PER_CSG elements so > this > comparison needs to be >= to prevent an out of bounds access. > > Fixes: 2718d91816ee ("drm/panthor: Add the FW logical block") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > --- > drivers/gpu/drm/panthor/panthor_fw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c > index 33c87a59834e..181395e2859a 100644 > --- a/drivers/gpu/drm/panthor/panthor_fw.c > +++ b/drivers/gpu/drm/panthor/panthor_fw.c > @@ -308,7 +308,7 @@ panthor_fw_get_csg_iface(struct panthor_device *ptdev, u32 csg_slot) > struct panthor_fw_cs_iface * > panthor_fw_get_cs_iface(struct panthor_device *ptdev, u32 csg_slot, u32 cs_slot) > { > - if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot > MAX_CS_PER_CSG)) > + if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot >= MAX_CS_PER_CSG)) > return NULL; > > return &ptdev->fw->iface.streams[csg_slot][cs_slot];
On Tue, 2 Apr 2024 12:56:42 +0300 Dan Carpenter <dan.carpenter@linaro.org> wrote: > The ->iface.streams[csg_slot][] array has MAX_CS_PER_CSG elements so > this > comparison needs to be >= to prevent an out of bounds access. > > Fixes: 2718d91816ee ("drm/panthor: Add the FW logical block") > Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Queued to drm-misc-next. Thanks, Boris > --- > drivers/gpu/drm/panthor/panthor_fw.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c > index 33c87a59834e..181395e2859a 100644 > --- a/drivers/gpu/drm/panthor/panthor_fw.c > +++ b/drivers/gpu/drm/panthor/panthor_fw.c > @@ -308,7 +308,7 @@ panthor_fw_get_csg_iface(struct panthor_device *ptdev, u32 csg_slot) > struct panthor_fw_cs_iface * > panthor_fw_get_cs_iface(struct panthor_device *ptdev, u32 csg_slot, u32 cs_slot) > { > - if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot > MAX_CS_PER_CSG)) > + if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot >= MAX_CS_PER_CSG)) > return NULL; > > return &ptdev->fw->iface.streams[csg_slot][cs_slot];
diff --git a/drivers/gpu/drm/panthor/panthor_fw.c b/drivers/gpu/drm/panthor/panthor_fw.c index 33c87a59834e..181395e2859a 100644 --- a/drivers/gpu/drm/panthor/panthor_fw.c +++ b/drivers/gpu/drm/panthor/panthor_fw.c @@ -308,7 +308,7 @@ panthor_fw_get_csg_iface(struct panthor_device *ptdev, u32 csg_slot) struct panthor_fw_cs_iface * panthor_fw_get_cs_iface(struct panthor_device *ptdev, u32 csg_slot, u32 cs_slot) { - if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot > MAX_CS_PER_CSG)) + if (drm_WARN_ON(&ptdev->base, csg_slot >= MAX_CSGS || cs_slot >= MAX_CS_PER_CSG)) return NULL; return &ptdev->fw->iface.streams[csg_slot][cs_slot];
The ->iface.streams[csg_slot][] array has MAX_CS_PER_CSG elements so this > comparison needs to be >= to prevent an out of bounds access. Fixes: 2718d91816ee ("drm/panthor: Add the FW logical block") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> --- drivers/gpu/drm/panthor/panthor_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)