diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 12:45:18 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-11-17 12:45:18 -0500 |
| commit | 09a0c06105ae115374961dd963a16faaed5bcabe (patch) | |
| tree | 78a72a7633c7fa5b92c6f2c489b2e67eb7825b23 /fs | |
| parent | a6c11fb64a0584a0bf3e59fc53de39bf72b85cc0 (diff) | |
| parent | f07cb3489cff38984a8df4d3a0fea5d0858c1eb0 (diff) | |
Merge tag 'v4.9.49' into v4.9-rt
This is the 4.9.49 stable release
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/user.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index 58c2f4a21b7f..9ac65914ab5b 100644 --- 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; |