dlm: replace one-element array with fixed size array

One-element arrays are deprecated. So, replace one-element array with
fixed size array member in struct dlm_ls, and refactor the rest of the
code, accordingly.

Link: https://github.com/KSPP/linux/issues/79
Link: https://github.com/KSPP/linux/issues/228
Link: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101836
Link: https://lore.kernel.org/lkml/Y0W5jkiXUkpNl4ap@mail.google.com/
Signed-off-by: Paulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index e34c3d2639a5a94ed48947581c56e6a3a20ebadf..94fadb619ba094e22e29175aba5a4c55f14f1b47 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -670,7 +670,7 @@ struct dlm_ls {
        void                    *ls_ops_arg;
 
        int                     ls_namelen;
-       char                    ls_name[1];
+       char                    ls_name[DLM_LOCKSPACE_LEN + 1];
 };
 
 /*

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index bae050df7abff63d62073b6df50a56a1e976f64f..9479c81109796c06efd3c21b0e4ef17b5c1b931d 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -473,7 +473,7 @@ static int new_lockspace(const char *name, const char *cluster,
 
        error = -ENOMEM;
 
-       ls = kzalloc(sizeof(struct dlm_ls) + namelen, GFP_NOFS);
+       ls = kzalloc(sizeof(*ls), GFP_NOFS);
        if (!ls)
                goto out;
        memcpy(ls->ls_name, name, namelen);