| Message ID | Y0XQsqdRzlrSpgOh@mail.google.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | d96d0f9617793b6cd95b9b9a8fef66f69f8f6b1b |
| Headers | show |
| Series | [v5,next] dlm: replace one-element array with fixed size array | expand |
On Wed, Oct 12, 2022 at 09:23:14AM +1300, Paulo Miguel Almeida wrote: > 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> Thanks! -- Gustavo > --- > Changelog: > > v5: use preferred sizeof style. Req: Gustavo Silva > v4: resend patch using the right version number. Req: Gustavo Silva > v3: replace one-element array with a fixed size array. Req: Kees Cook > v2: patch resent as I had an issue with a <CRLF> char in my mail client > v1: https://lore.kernel.org/lkml/Y0ICbf8tCtXMn+W0@mail.google.com/ > --- > > fs/dlm/dlm_internal.h | 2 +- > fs/dlm/lockspace.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h > index e34c3d2639a5..94fadb619ba0 100644 > --- 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 bae050df7abf..9479c8110979 100644 > --- 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); > -- > 2.37.3 >
On Wed, Oct 12, 2022 at 09:23:14AM +1300, Paulo Miguel Almeida wrote: > 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: Kees Cook <keescook@chromium.org>
On Wed, Oct 12, 2022 at 09:23:14AM +1300, Paulo Miguel Almeida wrote: > 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> > --- > Changelog: > > v5: use preferred sizeof style. Req: Gustavo Silva > v4: resend patch using the right version number. Req: Gustavo Silva > v3: replace one-element array with a fixed size array. Req: Kees Cook > v2: patch resent as I had an issue with a <CRLF> char in my mail client > v1: https://lore.kernel.org/lkml/Y0ICbf8tCtXMn+W0@mail.google.com/ > --- > > fs/dlm/dlm_internal.h | 2 +- > fs/dlm/lockspace.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h > index e34c3d2639a5..94fadb619ba0 100644 > --- 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 bae050df7abf..9479c8110979 100644 > --- 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); > -- > 2.37.3 > Christine, David, Just following up on this patch. Is there anything that either of you want me change for this patch to be merged? thanks! - Paulo A.
Hi, On Fri, Nov 4, 2022 at 1:00 AM Paulo Miguel Almeida <paulo.miguel.almeida.rodenas@gmail.com> wrote: > > On Wed, Oct 12, 2022 at 09:23:14AM +1300, Paulo Miguel Almeida wrote: > > 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> > > --- > > Changelog: > > > > v5: use preferred sizeof style. Req: Gustavo Silva > > v4: resend patch using the right version number. Req: Gustavo Silva > > v3: replace one-element array with a fixed size array. Req: Kees Cook > > v2: patch resent as I had an issue with a <CRLF> char in my mail client > > v1: https://lore.kernel.org/lkml/Y0ICbf8tCtXMn+W0@mail.google.com/ > > --- > > > > fs/dlm/dlm_internal.h | 2 +- > > fs/dlm/lockspace.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h > > index e34c3d2639a5..94fadb619ba0 100644 > > --- 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 bae050df7abf..9479c8110979 100644 > > --- 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); > > -- > > 2.37.3 > > > > Christine, David, > > Just following up on this patch. Is there anything that either of you > want me change for this patch to be merged? > I think it's fine. I am working on DLM and the current upstream process is more per release where I resend a huge patch-series to get it upstream into dlm/next based on a recent rc... It just takes time. Then your patch will of course be applied on. - Alex
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index e34c3d2639a5..94fadb619ba0 100644 --- 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 bae050df7abf..9479c8110979 100644 --- 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);
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> --- Changelog: v5: use preferred sizeof style. Req: Gustavo Silva v4: resend patch using the right version number. Req: Gustavo Silva v3: replace one-element array with a fixed size array. Req: Kees Cook v2: patch resent as I had an issue with a <CRLF> char in my mail client v1: https://lore.kernel.org/lkml/Y0ICbf8tCtXMn+W0@mail.google.com/ --- fs/dlm/dlm_internal.h | 2 +- fs/dlm/lockspace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)