| Message ID | 1559340578-11482-1-git-send-email-jcrouse@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm/adreno: Ensure that the zap shader region is big enough | expand |
On Fri 31 May 15:09 PDT 2019, Jordan Crouse wrote: > Before loading the zap shader we should ensure that the reserved memory > region is big enough to hold the loaded file. > > Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 6f7f411..3db8e49 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -67,7 +67,6 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > return ret; > > mem_phys = r.start; > - mem_size = resource_size(&r); > > /* Request the MDT file for the firmware */ > fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > @@ -83,6 +82,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > goto out; > } > > + if (mem_size > resource_size(&r)) { > + DRM_DEV_ERROR(dev, > + "memory region is too small to load the MDT\n"); > + ret = -E2BIG; > + goto out; > + } > + > /* Allocate memory for the firmware image */ > mem_region = memremap(mem_phys, mem_size, MEMREMAP_WC); > if (!mem_region) { > -- > 2.7.4 >
On Fri, May 31, 2019 at 4:09 PM Jordan Crouse <jcrouse@codeaurora.org> wrote: > > Before loading the zap shader we should ensure that the reserved memory > region is big enough to hold the loaded file. > > Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> Reviewed-by: Jeffrey Hugo <jeffrey.l.hugo@gmail.com> > --- > > drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > index 6f7f411..3db8e49 100644 > --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c > +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c > @@ -67,7 +67,6 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > return ret; > > mem_phys = r.start; > - mem_size = resource_size(&r); > > /* Request the MDT file for the firmware */ > fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); > @@ -83,6 +82,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, > goto out; > } > > + if (mem_size > resource_size(&r)) { > + DRM_DEV_ERROR(dev, > + "memory region is too small to load the MDT\n"); > + ret = -E2BIG; > + goto out; > + } > + > /* Allocate memory for the firmware image */ > mem_region = memremap(mem_phys, mem_size, MEMREMAP_WC); > if (!mem_region) { > -- > 2.7.4 > > _______________________________________________ > Freedreno mailing list > Freedreno@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/freedreno
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 6f7f411..3db8e49 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -67,7 +67,6 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, return ret; mem_phys = r.start; - mem_size = resource_size(&r); /* Request the MDT file for the firmware */ fw = adreno_request_fw(to_adreno_gpu(gpu), fwname); @@ -83,6 +82,13 @@ static int zap_shader_load_mdt(struct msm_gpu *gpu, const char *fwname, goto out; } + if (mem_size > resource_size(&r)) { + DRM_DEV_ERROR(dev, + "memory region is too small to load the MDT\n"); + ret = -E2BIG; + goto out; + } + /* Allocate memory for the firmware image */ mem_region = memremap(mem_phys, mem_size, MEMREMAP_WC); if (!mem_region) {
Before loading the zap shader we should ensure that the reserved memory region is big enough to hold the loaded file. Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)