diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-01-23 03:27:56 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 01:00:54 -0500 |
commit | af1ac18a19b80f922046fd383a3a3e780ee94915 (patch) | |
tree | e2ec7c6def1b7f315006e24b4d2745cdd7d0954a | |
parent | 264ce192b3e7f45d0adb37bfbab2b01a3fbe6c30 (diff) |
drm/nouveau/disp: sizeof() wrong pointer
"data" is a void pointer and "args" is "data" after we have casted it to
a struct. We care about the size of the struct here. Btw,
sizeof(*data) is 1.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c index 0d26f00a2f15..78f09c3dff1f 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nv50.c | |||
@@ -333,7 +333,7 @@ nv50_disp_sync_ctor(struct nouveau_object *parent, | |||
333 | struct nv50_disp_dmac *dmac; | 333 | struct nv50_disp_dmac *dmac; |
334 | int ret; | 334 | int ret; |
335 | 335 | ||
336 | if (size < sizeof(*data) || args->head > 1) | 336 | if (size < sizeof(*args) || args->head > 1) |
337 | return -EINVAL; | 337 | return -EINVAL; |
338 | 338 | ||
339 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, | 339 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, |
@@ -372,7 +372,7 @@ nv50_disp_ovly_ctor(struct nouveau_object *parent, | |||
372 | struct nv50_disp_dmac *dmac; | 372 | struct nv50_disp_dmac *dmac; |
373 | int ret; | 373 | int ret; |
374 | 374 | ||
375 | if (size < sizeof(*data) || args->head > 1) | 375 | if (size < sizeof(*args) || args->head > 1) |
376 | return -EINVAL; | 376 | return -EINVAL; |
377 | 377 | ||
378 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, | 378 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, |
diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c index 74626e8c020b..446189936612 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c | |||
@@ -228,7 +228,7 @@ nvd0_disp_sync_ctor(struct nouveau_object *parent, | |||
228 | struct nv50_disp_dmac *dmac; | 228 | struct nv50_disp_dmac *dmac; |
229 | int ret; | 229 | int ret; |
230 | 230 | ||
231 | if (size < sizeof(*data) || args->head >= priv->head.nr) | 231 | if (size < sizeof(*args) || args->head >= priv->head.nr) |
232 | return -EINVAL; | 232 | return -EINVAL; |
233 | 233 | ||
234 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, | 234 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, |
@@ -268,7 +268,7 @@ nvd0_disp_ovly_ctor(struct nouveau_object *parent, | |||
268 | struct nv50_disp_dmac *dmac; | 268 | struct nv50_disp_dmac *dmac; |
269 | int ret; | 269 | int ret; |
270 | 270 | ||
271 | if (size < sizeof(*data) || args->head >= priv->head.nr) | 271 | if (size < sizeof(*args) || args->head >= priv->head.nr) |
272 | return -EINVAL; | 272 | return -EINVAL; |
273 | 273 | ||
274 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, | 274 | ret = nv50_disp_dmac_create_(parent, engine, oclass, args->pushbuf, |