erofs-utils: Add missing error code handling.
PATCH v2 1/1 erofs-utils: Add missing error code handling.
Handling error conditions that are missed in few scenarios. also, mkfs command should return 1 on failure and 0 on success.
--- lib/inode.c | 10 ++++++++-- mkfs/main.c | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-)
lib/inode.c +8 -2
@@ -752,8 +752,14 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) }closedir (_dir); -erofs_prepare_dir_file (dir); -erofs_prepare_inode_buffer (dir); + ret =erofs_prepare_dir_file (dir); +if (!ret) + goto err_closedir; + + ret =erofs_prepare_inode_buffer (dir); +if (!ret) + goto err_closedir; +if (IS_ROOT (dir))erofs_fixup_meta_blkaddr (dir);
mkfs/main.c +7 -1
@@ -212,6 +212,12 @@ int main(int argc, char **argv)erofs_show_config (); sb_bh =erofs_buffer_init (); +if (IS_ERR (sb_bh)) { + err =PTR_ERR (sb_bh); +erofs_err ("Failed to initialize super block buffer head : %s" , +erofs_strerror (err)); + goto exit; + } err =erofs_bh_balloon (sb_bh,EROFS_SUPER_END );if (err <0 ) { erofs_err("Failed to balloon erofs_super_block: %s",
@@ -254,5 +260,5 @@ exit: erofs_strerror(err));return 1 ; } -return err; +return 0 ; }
Signature · 1 line
2.9.3
PATCH v2 1/1 erofs-utils: Add missing error code handling.
Hi Pratik,
Quoted 14 lines · Pratik Shinde
Handling error conditions that are missed in few scenarios. also, mkfs command should return 1 on failure and 0 on success.
Signed-off-by Pratik Shinde <pratikshinde320 at gmail.com>--- lib/inode.c | 10 ++++++++-- mkfs/main.c | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-)lib/inode.c +0
-0
lib/inode.c struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) · line 757
Quoted 8 lines
lib/inode.c +3
-2@@ -752,8 +752,14 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) }closedir (_dir); -erofs_prepare_dir_file (dir); -erofs_prepare_inode_buffer (dir); + ret =erofs_prepare_dir_file (dir); +if (!ret) + goto err_closedir;
Maybe it should be "if (ret)"? Have you use this patch to generate some images?
if(!ret)
^ --- no space here
lib/inode.c struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) · line 761
Quoted 4 lines
lib/inode.c +4
-0+ + ret =erofs_prepare_inode_buffer (dir); +if (!ret) + goto err_closedir;
ditto.
Quoted 9 lines
lib/inode.c +1
-0+if (IS_ROOT (dir))erofs_fixup_meta_blkaddr (dir);mkfs/main.c +0
-0
mkfs/main.c int main(int argc, char **argv) · line 217
Quoted 6 lines
mkfs/main.c +3
-0@@ -212,6 +212,12 @@ int main(int argc, char **argv)erofs_show_config (); sb_bh =erofs_buffer_init (); +if (IS_ERR (sb_bh)) { + err =PTR_ERR (sb_bh); + erofs_err("Failed to initialize super block buffer head : %s",
erofs_err("Failed to initialize buffers: %s",
Thanks,
Gao Xiang
Quoted 14 lines
mkfs/main.c +4
-1+ erofs_strerror(err)); + goto exit; + } err =erofs_bh_balloon (sb_bh,EROFS_SUPER_END );if (err <0 ) { erofs_err("Failed to balloon erofs_super_block: %s",@@ -254,5 +260,5 @@ exit: erofs_strerror(err));return 1 ; } -return err; +return 0 ; }
PATCH v2 1/1 erofs-utils: Add missing error code handling.
Hi Gao,
Thanks. and yes, the condition should be 'if (ret)' . Corrected it and few others too. With the new patch I am able to create erofs image. Will send a new patch with bumped up version.
-Pratik
Quoted 62 lines · Gao Xiang,
Hi Pratik,
lib/inode.c struct erofs_inode *erofs_mkfs_build_tree(struct
Quoted 14 lines · Pratik Shinde
Handling error conditions that are missed in few scenarios. also, mkfs command should return 1 on failure and 0 on success.
Signed-off-by Pratik Shinde <pratikshinde320 at gmail.com>--- lib/inode.c | 10 ++++++++-- mkfs/main.c | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-)lib/inode.c +0
-0@@ -752,8 +752,14 @@ struct erofs_inode *erofs_mkfs_build_tree(struct
erofs_inode*dir)lib/inode.c struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) · line 757
Quoted 8 lines
lib/inode.c +3
-2}closedir (_dir); -erofs_prepare_dir_file (dir); -erofs_prepare_inode_buffer (dir); + ret =erofs_prepare_dir_file (dir); +if (!ret) + goto err_closedir;Maybe it should be "if (ret)"? Have you use this patch to generate some images?
if(!ret)
^ --- no space herelib/inode.c struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) · line 761
Quoted 4 lines
lib/inode.c +4
-0+ + ret =erofs_prepare_inode_buffer (dir); +if (!ret) + goto err_closedir;ditto.
Quoted 9 lines
lib/inode.c +1
-0+if (IS_ROOT (dir))erofs_fixup_meta_blkaddr (dir);mkfs/main.c +0
-0mkfs/main.c int main(int argc, char **argv) · line 217
Quoted 6 lines
mkfs/main.c +3
-0@@ -212,6 +212,12 @@ int main(int argc, char **argv)erofs_show_config (); sb_bh =erofs_buffer_init (); +if (IS_ERR (sb_bh)) { + err =PTR_ERR (sb_bh); + erofs_err("Failed to initialize super block buffer head :%s",
erofs_err("Failed to initialize buffers: %s",
Thanks,
Gao Xiang
Quoted 15 lines
Quoted 8 lines
mkfs/main.c +3
-0+ erofs_strerror(err)); + goto exit; + } err =erofs_bh_balloon (sb_bh,EROFS_SUPER_END );if (err <0 ) { erofs_err("Failed to balloon erofs_super_block: %s",mkfs/main.c exit: · line 264
Quoted 6 lines
mkfs/main.c +1
-1@@ -254,5 +260,5 @@ exit: erofs_strerror(err));return 1 ; } -return err; +return 0 ; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linux-erofs/attachments/20190724/99f3fb74/attachment.htm>