* [PATCH] drm/radeon: check buffer relocation offset
@ 2014-04-28 13:40 Leo Liu
2014-04-28 14:17 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Leo Liu @ 2014-04-28 13:40 UTC (permalink / raw)
To: dri-devel
Signed-off-by: Leo Liu <leo.liu@amd.com>
Cc:stable@vger.kernel.org
---
drivers/gpu/drm/radeon/radeon_uvd.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index 5748bda..0f96c47 100644
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -465,6 +465,10 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
cmd = radeon_get_ib_value(p, p->idx) >> 1;
if (cmd < 0x4) {
+ if (end <= start) {
+ DRM_ERROR("invalid reloc offset %X!\n", offset);
+ return -EINVAL;
+ }
if ((end - start) < buf_sizes[cmd]) {
DRM_ERROR("buffer (%d) to small (%d / %d)!\n", cmd,
(unsigned)(end - start), buf_sizes[cmd]);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/radeon: check buffer relocation offset
2014-04-28 13:40 [PATCH] drm/radeon: check buffer relocation offset Leo Liu
@ 2014-04-28 14:17 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2014-04-28 14:17 UTC (permalink / raw)
To: Leo Liu, dri-devel
Am 28.04.2014 15:40, schrieb Leo Liu:
> Signed-off-by: Leo Liu <leo.liu@amd.com>
> Cc:stable@vger.kernel.org
There should be a space between the "CC:" and "stable@vger.kernel.org"
> ---
> drivers/gpu/drm/radeon/radeon_uvd.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
> index 5748bda..0f96c47 100644
> --- a/drivers/gpu/drm/radeon/radeon_uvd.c
> +++ b/drivers/gpu/drm/radeon/radeon_uvd.c
> @@ -465,6 +465,10 @@ static int radeon_uvd_cs_reloc(struct radeon_cs_parser *p,
> cmd = radeon_get_ib_value(p, p->idx) >> 1;
>
> if (cmd < 0x4) {
> + if (end <= start) {
> + DRM_ERROR("invalid reloc offset %X!\n", offset);
> + return -EINVAL;
> + }
No idea where that came from (mail client or your editor), but
checkpatch.pl complained that those new lines ended with DOS line endings.
Anyway I've fixed those minor problems and applied it to my 3.15 queue.
Thanks,
Christian.
> if ((end - start) < buf_sizes[cmd]) {
> DRM_ERROR("buffer (%d) to small (%d / %d)!\n", cmd,
> (unsigned)(end - start), buf_sizes[cmd]);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-28 14:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-28 13:40 [PATCH] drm/radeon: check buffer relocation offset Leo Liu
2014-04-28 14:17 ` Christian König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.