Commit 8423d75d authored by Lucas Stach's avatar Lucas Stach Committed by Ben Skeggs

drm/nouveau: fix notify data leak

There is no reason to not free the notify data if the NTFY_DEL ioctl
failed. As nvif_notify_fini() is also called from the cleanup path of
nvif_notify_init(), the notifier may not have been successfully created
at that point. But it should also be the right thing to just free the
data in the regular fini calls, as there is nothing much we can do if
the ioctl fails, so better not leak memory.
Signed-off-by: default avatarLucas Stach <dev@lynxeye.de>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9a47a657
...@@ -155,11 +155,9 @@ nvif_notify_fini(struct nvif_notify *notify) ...@@ -155,11 +155,9 @@ nvif_notify_fini(struct nvif_notify *notify)
int ret = nvif_notify_put(notify); int ret = nvif_notify_put(notify);
if (ret >= 0 && object) { if (ret >= 0 && object) {
ret = nvif_object_ioctl(object, &args, sizeof(args), NULL); ret = nvif_object_ioctl(object, &args, sizeof(args), NULL);
if (ret == 0) {
notify->object = NULL; notify->object = NULL;
kfree((void *)notify->data); kfree((void *)notify->data);
} }
}
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment