Merge tag 'dlm-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm

Pull dlm updates from David Teigland:
 "This set includes a bunch of minor code cleanups that have
  accumulated, probably from code analyzers people like to run. There is
  one nice fix that avoids some socket leaks by switching to use
  sock_create_lite()"

* tag 'dlm-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: use sock_create_lite inside tcp_accept_from_sock
  uapi linux/dlm_netlink.h: include linux/dlmconstants.h
  dlm: avoid double-free on error path in dlm_device_{register,unregister}
  dlm: constify kset_uevent_ops structure
  dlm: print log message when cluster name is not set
  dlm: Delete an unnecessary variable initialisation in dlm_ls_start()
  dlm: Improve a size determination in two functions
  dlm: Use kcalloc() in two functions
  dlm: Use kmalloc_array() in make_member_array()
  dlm: Delete an error message for a failed memory allocation in dlm_recover_waiters_pre()
  dlm: Improve a size determination in dlm_recover_waiters_pre()
  dlm: Use kcalloc() in dlm_scan_waiters()
  dlm: Improve a size determination in table_seq_start()
  dlm: Add spaces for better code readability
  dlm: Replace six seq_puts() calls by seq_putc()
  dlm: Make dismatch error message more clear
  dlm: Fix kernel memory disclosure

7 files changed, 36 insertions, 30 deletions

diff --git a/fs/dlm/debug_fs.c b/fs/dlm/debug_fs.c
index ca7089aeadab..fa08448e35dd 100644
--- a/fs/dlm/debug_fs.c
+++ b/fs/dlm/debug_fs.c
@@ -68,7 +68,7 @@ static void print_format1_lock(struct seq_file *s, struct dlm_lkb *lkb,
         if (lkb->lkb_wait_type)
                 seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
 
-        seq_puts(s, "\n");
+        seq_putc(s, '\n');
 }
 
 static void print_format1(struct dlm_rsb *res, struct seq_file *s)
@@ -111,7 +111,7 @@ static void print_format1(struct dlm_rsb *res, struct seq_file *s)
                 }
                 if (rsb_flag(res, RSB_VALNOTVALID))
                         seq_puts(s, " (INVALID)");
-                seq_puts(s, "\n");
+                seq_putc(s, '\n');
                 if (seq_has_overflowed(s))
                         goto out;
         }
@@ -156,7 +156,7 @@ static void print_format1(struct dlm_rsb *res, struct seq_file *s)
                            lkb->lkb_id, print_lockmode(lkb->lkb_rqmode));
                 if (lkb->lkb_wait_type)
                         seq_printf(s, " wait_type: %d", lkb->lkb_wait_type);
-                seq_puts(s, "\n");
+                seq_putc(s, '\n');
                 if (seq_has_overflowed(s))
                         goto out;
         }
@@ -287,7 +287,7 @@ static void print_format3(struct dlm_rsb *r, struct seq_file *s)
                 else
                         seq_printf(s, " %02x", (unsigned char)r->res_name[i]);
         }
-        seq_puts(s, "\n");
+        seq_putc(s, '\n');
         if (seq_has_overflowed(s))
                 goto out;
 
@@ -298,7 +298,7 @@ static void print_format3(struct dlm_rsb *r, struct seq_file *s)
 
         for (i = 0; i < lvblen; i++)
                 seq_printf(s, " %02x", (unsigned char)r->res_lvbptr[i]);
-        seq_puts(s, "\n");
+        seq_putc(s, '\n');
         if (seq_has_overflowed(s))
                 goto out;
 
@@ -361,8 +361,7 @@ static void print_format4(struct dlm_rsb *r, struct seq_file *s)
                 else
                         seq_printf(s, " %02x", (unsigned char)r->res_name[i]);
         }
-        seq_puts(s, "\n");
-
+        seq_putc(s, '\n');
         unlock_rsb(r);
 }
 
@@ -436,7 +435,7 @@ static void *table_seq_start(struct seq_file *seq, loff_t *pos)
         if (bucket >= ls->ls_rsbtbl_size)
                 return NULL;
 
-        ri = kzalloc(sizeof(struct rsbtbl_iter), GFP_NOFS);
+        ri = kzalloc(sizeof(*ri), GFP_NOFS);
         if (!ri)
                 return NULL;
         if (n == 0)
@@ -742,7 +741,7 @@ void dlm_delete_debug_file(struct dlm_ls *ls)
 
 int dlm_create_debug_file(struct dlm_ls *ls)
 {
-        char name[DLM_LOCKSPACE_LEN+8];
+        char name[DLM_LOCKSPACE_LEN + 8];
 
         /* format 1 */
 
@@ -757,7 +756,7 @@ int dlm_create_debug_file(struct dlm_ls *ls)
         /* format 2 */
 
         memset(name, 0, sizeof(name));
-        snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_locks", ls->ls_name);
+        snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_locks", ls->ls_name);
 
         ls->ls_debug_locks_dentry = debugfs_create_file(name,
                                                         S_IFREG | S_IRUGO,
@@ -770,7 +769,7 @@ int dlm_create_debug_file(struct dlm_ls *ls)
         /* format 3 */
 
         memset(name, 0, sizeof(name));
-        snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_all", ls->ls_name);
+        snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_all", ls->ls_name);
 
         ls->ls_debug_all_dentry = debugfs_create_file(name,
                                                       S_IFREG | S_IRUGO,
@@ -783,7 +782,7 @@ int dlm_create_debug_file(struct dlm_ls *ls)
         /* format 4 */
 
         memset(name, 0, sizeof(name));
-        snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_toss", ls->ls_name);
+        snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_toss", ls->ls_name);
 
         ls->ls_debug_toss_dentry = debugfs_create_file(name,
                                                        S_IFREG | S_IRUGO,
@@ -794,7 +793,7 @@ int dlm_create_debug_file(struct dlm_ls *ls)
                 goto fail;
 
         memset(name, 0, sizeof(name));
-        snprintf(name, DLM_LOCKSPACE_LEN+8, "%s_waiters", ls->ls_name);
+        snprintf(name, DLM_LOCKSPACE_LEN + 8, "%s_waiters", ls->ls_name);
 
         ls->ls_debug_waiters_dentry = debugfs_create_file(name,
                                                           S_IFREG | S_IRUGO,
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 6df332296c66..d4aaddec1b16 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -1426,7 +1426,7 @@ void dlm_scan_waiters(struct dlm_ls *ls)
 
                 if (!num_nodes) {
                         num_nodes = ls->ls_num_nodes;
-                        warned = kzalloc(num_nodes * sizeof(int), GFP_KERNEL);
+                        warned = kcalloc(num_nodes, sizeof(int), GFP_KERNEL);
                 }
                 if (!warned)
                         continue;
@@ -5119,11 +5119,9 @@ void dlm_recover_waiters_pre(struct dlm_ls *ls)
         int wait_type, stub_unlock_result, stub_cancel_result;
         int dir_nodeid;
 
-        ms_stub = kmalloc(sizeof(struct dlm_message), GFP_KERNEL);
-        if (!ms_stub) {
-                log_error(ls, "dlm_recover_waiters_pre no mem");
+        ms_stub = kmalloc(sizeof(*ms_stub), GFP_KERNEL);
+        if (!ms_stub)
                 return;
-        }
 
         mutex_lock(&ls->ls_waiters_mutex);
 
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 91592b75c309..78a7c855b06b 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -235,7 +235,7 @@ static int dlm_uevent(struct kset *kset, struct kobject *kobj,
         return 0;
 }
 
-static struct kset_uevent_ops dlm_uevent_ops = {
+static const struct kset_uevent_ops dlm_uevent_ops = {
         .uevent = dlm_uevent,
 };
 
@@ -453,9 +453,14 @@ static int new_lockspace(const char *name, const char *cluster,
                         *ops_result = 0;
         }
 
+        if (!cluster)
+                log_print("dlm cluster name '%s' is being used without an application provided cluster name",
+                          dlm_config.ci_cluster_name);
+
         if (dlm_config.ci_recover_callbacks && cluster &&
             strncmp(cluster, dlm_config.ci_cluster_name, DLM_LOCKSPACE_LEN)) {
-                log_print("dlm cluster name %s mismatch %s",
+                log_print("dlm cluster name '%s' does not match "
+                          "the application cluster name '%s'",
                           dlm_config.ci_cluster_name, cluster);
                 error = -EBADR;
                 goto out;
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 9382db998ec9..4813d0e0cd9b 100644
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -729,7 +729,7 @@ static int tcp_accept_from_sock(struct connection *con)
         mutex_unlock(&connections_lock);
 
         memset(&peeraddr, 0, sizeof(peeraddr));
-        result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family,
+        result = sock_create_lite(dlm_local_addr[0]->ss_family,
                                   SOCK_STREAM, IPPROTO_TCP, &newsock);
         if (result < 0)
                 return -ENOMEM;
diff --git a/fs/dlm/member.c b/fs/dlm/member.c
index 9c47f1c14a8b..3fda3832cf6a 100644
--- a/fs/dlm/member.c
+++ b/fs/dlm/member.c
@@ -217,8 +217,7 @@ int dlm_slots_assign(struct dlm_ls *ls, int *num_slots, int *slots_size,
         }
 
         array_size = max + need;
-
-        array = kzalloc(array_size * sizeof(struct dlm_slot), GFP_NOFS);
+        array = kcalloc(array_size, sizeof(*array), GFP_NOFS);
         if (!array)
                 return -ENOMEM;
 
@@ -319,7 +318,7 @@ static int dlm_add_member(struct dlm_ls *ls, struct dlm_config_node *node)
         struct dlm_member *memb;
         int error;
 
-        memb = kzalloc(sizeof(struct dlm_member), GFP_NOFS);
+        memb = kzalloc(sizeof(*memb), GFP_NOFS);
         if (!memb)
                 return -ENOMEM;
 
@@ -405,8 +404,7 @@ static void make_member_array(struct dlm_ls *ls)
         }
 
         ls->ls_total_weight = total;
-
-        array = kmalloc(sizeof(int) * total, GFP_NOFS);
+        array = kmalloc_array(total, sizeof(*array), GFP_NOFS);
         if (!array)
                 return;
 
@@ -492,8 +490,7 @@ void dlm_lsop_recover_done(struct dlm_ls *ls)
                 return;
 
         num = ls->ls_num_nodes;
-
-        slots = kzalloc(num * sizeof(struct dlm_slot), GFP_KERNEL);
+        slots = kcalloc(num, sizeof(*slots), GFP_KERNEL);
         if (!slots)
                 return;
 
@@ -673,11 +670,11 @@ int dlm_ls_stop(struct dlm_ls *ls)
 
 int dlm_ls_start(struct dlm_ls *ls)
 {
-        struct dlm_recover *rv = NULL, *rv_old;
+        struct dlm_recover *rv, *rv_old;
         struct dlm_config_node *nodes;
         int error, count;
 
-        rv = kzalloc(sizeof(struct dlm_recover), GFP_NOFS);
+        rv = kzalloc(sizeof(*rv), GFP_NOFS);
         if (!rv)
                 return -ENOMEM;
 
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 23488f559cf9..d18e7a539f11 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -123,6 +123,8 @@ static void compat_input(struct dlm_write_request *kb,
 static void compat_output(struct dlm_lock_result *res,
                           struct dlm_lock_result32 *res32)
 {
+        memset(res32, 0, sizeof(*res32));
+
         res32->version[0] = res->version[0];
         res32->version[1] = res->version[1];
         res32->version[2] = res->version[2];
@@ -355,6 +357,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;
diff --git a/include/uapi/linux/dlm_netlink.h b/include/uapi/linux/dlm_netlink.h
index 647c8ef27227..ef1e2e08769a 100644
--- a/include/uapi/linux/dlm_netlink.h
+++ b/include/uapi/linux/dlm_netlink.h
@@ -10,6 +10,7 @@
 #define _DLM_NETLINK_H
 
 #include <linux/types.h>
+#include <linux/dlmconstants.h>
 
 enum {
         DLM_STATUS_WAITING = 1,