UBUNTU: Ubuntu-4.13.0-45.50

[mirror_ubuntu-artful-kernel.git] / fs / dlm / user.c

diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 23488f559cf969180a5c9b827477196acef5ff8e..84199151b64bd531fd1e386418a60b83672e468c 100644 (file)
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -355,6 +355,10 @@ static int dlm_device_register(struct dlm_ls *ls, char *name)
        error = misc_register(&ls->ls_device);
        if (error) {
                kfree(ls->ls_device.name);
+               /* this has to be set to NULL
+                * to avoid a double-free in dlm_device_deregister
+                */
+               ls->ls_device.name = NULL;
        }
 fail:
        return error;