ocfs2: drop a VLA in ocfs2_orphan_del()
PATCH 1/1 ocfs2: drop a VLA in ocfs2_orphan_del()
Avoid a VLA[1] by using a real constant expression instead of a variable. The compiler should be able to optimize the original code and avoid using an actual VLA. Anyway this change is useful because it will avoid a false positive with -Wvla, it might also help the compiler generating better code.
[1] https://lkml.org/lkml/2018/3/7/621
--- fs/ocfs2/namei.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ocfs2/namei.c +1 -2
@@ -2332,8 +2332,7 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,struct buffer_head *orphan_dir_bh, bool dio) { -const int namelen =OCFS2_DIO_ORPHAN_PREFIX_LEN +OCFS2_ORPHAN_NAMELEN ; -char name[namelen +1 ]; + char name[OCFS2_DIO_ORPHAN_PREFIX_LEN + OCFS2_ORPHAN_NAMELEN + 1];struct ocfs2_dinode *orphan_fe;int status =0 ;struct ocfs2_dir_lookup_result lookup = {NULL , };
Signature · 1 line
1.9.1
Quoted 9 lines · Salvatore Mesoraca
Avoid a VLA[1] by using a real constant expression instead of a variable. The compiler should be able to optimize the original code and avoid using an actual VLA. Anyway this change is useful because it will avoid a false positive with -Wvla, it might also help the compiler generating better code.
[1] https://lkml.org/lkml/2018/3/7/621
Signed-off-by Salvatore Mesoraca <[email protected]>
Andrew, can you take this? It seems the most recent patch to ocfs2 went through your tree...
-Kees
Quoted 21 lines
--- fs/ocfs2/namei.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/ocfs2/namei.c +1
-3@@ -2332,8 +2332,7 @@ int ocfs2_orphan_del(struct ocfs2_super *osb,struct buffer_head *orphan_dir_bh, bool dio) { -const int namelen =OCFS2_DIO_ORPHAN_PREFIX_LEN +OCFS2_ORPHAN_NAMELEN ; -char name[namelen +1 ]; + char name[OCFS2_DIO_ORPHAN_PREFIX_LEN + OCFS2_ORPHAN_NAMELEN + 1];struct ocfs2_dinode *orphan_fe;int status =0 ;struct ocfs2_dir_lookup_result lookup = {NULL , }; --1.9.1
Signature · 2 lines
Kees Cook Pixel Security