mdadm/Monitor:dev should be a block file when use --waitclean

Started by Zhilong Liu on Mar 20, 2017

Subsystems (1)

Maintainers (1)

DORMANTno replies

open the first message on its own page

Message details and related content
Monitor: mdadm --wait-clean /dev/mdX, the dev should
be a block file, otherwise fd2devnm returns NULL and
then triggers core dumped.

Signed-off-by: Zhilong Liu <redacted>
---
 Monitor.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
diff --git a/Monitor.c b/Monitor.c
index f8850d3..5a2b5ca 100644
--- a/Monitor.c
+++ b/Monitor.c
@@ -1065,7 +1065,17 @@ int WaitClean(char *dev, int sock, int verbose)
 	struct mdinfo *mdi;
 	int rv = 1;
 	char devnm[32];
+	struct stat stb;
 
+	if (stat(dev, &stb) != 0) {
+		pr_err("Cannot find %s: %s\n", dev,
+			strerror(errno));
+		return 2;
+	}
+	if ((S_IFMT & stb.st_mode) != S_IFBLK) {
+		pr_err("%s is not a block device.\n", dev);
+		return 2;
+	}
 	fd = open(dev, O_RDONLY);
 	if (fd < 0) {
 		if (verbose)
-- 
2.6.6
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help