diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-12 22:56:09 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-08-15 07:58:39 +1000 |
| commit | ef07ceae02271ac6eadc9f5cd652bb7162455a1b (patch) | |
| tree | f4bd1b596e4bf62ae951ce7770fb1a3bc9ca571b | |
| parent | 147ed897e807e1a6e2c6fd9dc91830f1d2831d43 (diff) | |
| download | gfs2-3.0-fixes-ef07ceae02271ac6eadc9f5cd652bb7162455a1b.tar.gz | |
drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0
Reported by Coverity. The intention is that the return value is
checked, but let's be more paranoid and make it extremely obvious
if something forgets to.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/notify.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvif/object.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvif/notify.c b/drivers/gpu/drm/nouveau/nvif/notify.c index 7e03cdd178270..0898c3155292c 100644 --- a/drivers/gpu/drm/nouveau/nvif/notify.c +++ b/drivers/gpu/drm/nouveau/nvif/notify.c @@ -237,8 +237,10 @@ nvif_notify_new(struct nvif_object *object, int (*func)(struct nvif_notify *), if (notify) { int ret = nvif_notify_init(object, nvif_notify_del, func, work, type, data, size, reply, notify); - if (ret) + if (ret) { kfree(notify); + notify = NULL; + } *pnotify = notify; return ret; } diff --git a/drivers/gpu/drm/nouveau/nvif/object.c b/drivers/gpu/drm/nouveau/nvif/object.c index b0c82206ece20..dd85b56f6aa50 100644 --- a/drivers/gpu/drm/nouveau/nvif/object.c +++ b/drivers/gpu/drm/nouveau/nvif/object.c @@ -275,8 +275,10 @@ nvif_object_new(struct nvif_object *parent, u32 handle, u32 oclass, if (object) { int ret = nvif_object_init(parent, nvif_object_del, handle, oclass, data, size, object); - if (ret) + if (ret) { kfree(object); + object = NULL; + } *pobject = object; return ret; } |