| Message ID | 20230726215919.never.127-kees@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ocfs2: Use regular seq_show_option for osb_cluster_stack | expand |
On 7/27/23 5:59 AM, Kees Cook wrote: > While cleaning up seq_show_option_n()'s use of strncpy, it was noticed > that the osb_cluster_stack member is always NUL-terminated, so there is > no need to use the special seq_show_option_n() routine. Replace it with > the standard seq_show_option() routine. > > Cc: Mark Fasheh <mark@fasheh.com> > Cc: Joel Becker <jlbec@evilplan.org> > Cc: Joseph Qi <joseph.qi@linux.alibaba.com> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: ocfs2-devel@lists.linux.dev > Signed-off-by: Kees Cook <keescook@chromium.org> Looks good. Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com> > --- > --- > fs/ocfs2/super.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c > index 988d1c076861..6b906424902b 100644 > --- a/fs/ocfs2/super.c > +++ b/fs/ocfs2/super.c > @@ -1517,8 +1517,7 @@ static int ocfs2_show_options(struct seq_file *s, struct dentry *root) > seq_printf(s, ",localflocks,"); > > if (osb->osb_cluster_stack[0]) > - seq_show_option_n(s, "cluster_stack", osb->osb_cluster_stack, > - OCFS2_STACK_LABEL_LEN); > + seq_show_option(s, "cluster_stack", osb->osb_cluster_stack); > if (opts & OCFS2_MOUNT_USRQUOTA) > seq_printf(s, ",usrquota"); > if (opts & OCFS2_MOUNT_GRPQUOTA)
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 988d1c076861..6b906424902b 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1517,8 +1517,7 @@ static int ocfs2_show_options(struct seq_file *s, struct dentry *root) seq_printf(s, ",localflocks,"); if (osb->osb_cluster_stack[0]) - seq_show_option_n(s, "cluster_stack", osb->osb_cluster_stack, - OCFS2_STACK_LABEL_LEN); + seq_show_option(s, "cluster_stack", osb->osb_cluster_stack); if (opts & OCFS2_MOUNT_USRQUOTA) seq_printf(s, ",usrquota"); if (opts & OCFS2_MOUNT_GRPQUOTA)
While cleaning up seq_show_option_n()'s use of strncpy, it was noticed that the osb_cluster_stack member is always NUL-terminated, so there is no need to use the special seq_show_option_n() routine. Replace it with the standard seq_show_option() routine. Cc: Mark Fasheh <mark@fasheh.com> Cc: Joel Becker <jlbec@evilplan.org> Cc: Joseph Qi <joseph.qi@linux.alibaba.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: ocfs2-devel@lists.linux.dev Signed-off-by: Kees Cook <keescook@chromium.org> --- --- fs/ocfs2/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)