[PATCH] erofs-utils: Fail the image creation when source path is not a directory file.

Gao Xiang hsiangkao at aol.com
Sat Aug 17 06:43:08 AEST 2019


On Fri, Aug 16, 2019 at 11:36:24PM +0800, Li Guifu wrote:
> 
> ?? 2019/8/16 16:56, Pratik Shinde ????:
> > In the erofs.mkfs utility, if the source path is not a directory,image
> > creation should not proceed.since root of the filesystem needs to be a directory.
> > 
> > moving the check to main function.
> > 
> > Signed-off-by: Pratik Shinde <pratikshinde320 at gmail.com>
> 
> It looks good.
> Reviewed-by Li Guifu <blucerlee at gmail.com>

Fold in the original patch as well :)

Thanks,
Gao Xiang

> Thanks
> 
> 
> > ---
> >   mkfs/main.c | 11 +++++++++++
> >   1 file changed, 11 insertions(+)
> > 
> > diff --git a/mkfs/main.c b/mkfs/main.c
> > index 93cacca..8fbfced 100644
> > --- a/mkfs/main.c
> > +++ b/mkfs/main.c
> > @@ -12,6 +12,7 @@
> >   #include <stdlib.h>
> >   #include <limits.h>
> >   #include <libgen.h>
> > +#include <sys/stat.h>
> >   #include "erofs/config.h"
> >   #include "erofs/print.h"
> >   #include "erofs/cache.h"
> > @@ -187,6 +188,7 @@ int main(int argc, char **argv)
> >   	struct erofs_buffer_head *sb_bh;
> >   	struct erofs_inode *root_inode;
> >   	erofs_nid_t root_nid;
> > +	struct stat64 st;
> >   	erofs_init_configure();
> >   	fprintf(stderr, "%s %s\n", basename(argv[0]), cfg.c_version);
> > @@ -197,6 +199,15 @@ int main(int argc, char **argv)
> >   			usage();
> >   		return 1;
> >   	}
> > +	err = lstat64(cfg.c_src_path, &st);
> > +	if (err)
> > +		return 1;
> > +	if ((st.st_mode & S_IFMT) != S_IFDIR) {
> > +		erofs_err("root of the filesystem is not a directory - %s",
> > +			  cfg.c_src_path);
> > +		usage();
> > +		return 1;
> > +	}
> >   	err = dev_open(cfg.c_img_path);
> >   	if (err) {
> > 


More information about the Linux-erofs mailing list