From: pratikshinde320@gmail.com (Pratik Shinde)
Subject: [PATCH] erofs-utils : Fail the image creation when source path is not a directory file.
Date: Fri, 16 Aug 2019 12:38:46 +0530 [thread overview]
Message-ID: <20190816070846.21557-1-pratikshinde320@gmail.com> (raw)
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.
In the erofs kernel code, we return error in case root inode(read from disk) is not
a directory.But the mkfs utility lets you create an image based on Regular file
(S_IFREG) too.
Signed-off-by: Pratik Shinde <pratikshinde320 at gmail.com>
---
mkfs/main.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/mkfs/main.c b/mkfs/main.c
index 93cacca..e72b9e2 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"
@@ -76,8 +77,8 @@ static int parse_extended_opts(const char *opts)
static int mkfs_parse_options_cfg(int argc, char *argv[])
{
- int opt, i;
-
+ int opt, i, ret;
+ struct stat64 st;
while ((opt = getopt(argc, argv, "d:z:E:")) != -1) {
switch (opt) {
case 'z':
@@ -135,7 +136,14 @@ static int mkfs_parse_options_cfg(int argc, char *argv[])
erofs_strerror(-errno));
return -ENOENT;
}
-
+ ret = lstat64(cfg.c_src_path, &st);
+ if (ret)
+ return -EINVAL;
+ if ((st.st_mode & S_IFMT) != S_IFDIR) {
+ erofs_err("root of the filesystem is not a directory - %s",
+ cfg.c_src_path);
+ return -EINVAL;
+ }
if (optind < argc) {
erofs_err("Unexpected argument: %s\n", argv[optind]);
return -EINVAL;
--
2.9.3
next reply other threads:[~2019-08-16 7:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 7:08 Pratik Shinde [this message]
2019-08-16 7:37 ` [PATCH] erofs-utils : Fail the image creation when source path is not a directory file Gao Xiang
-- strict thread matches above, loose matches on Subject: below --
2019-08-16 8:56 [PATCH] erofs-utils: " Pratik Shinde
2019-08-16 12:32 ` Gao Xiang
2019-08-16 15:36 ` Li Guifu
2019-08-16 20:43 ` Gao Xiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190816070846.21557-1-pratikshinde320@gmail.com \
--to=pratikshinde320@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox