Whamcloud - gitweb
append_pathname: check the value returned by realloc
authorwuguanghao <wuguanghao3@huawei.com>
Wed, 30 Jun 2021 08:27:18 +0000 (16:27 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 16 Jul 2021 03:38:36 +0000 (23:38 -0400)
In append_pathname(), we need to add a new path to save the value
returned by realloc, otherwise the name->path may be NULL, causing
a segfault.

Signed-off-by: Wu Guanghao <wuguanghao3@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
contrib/fsstress.c

index 2a98348..2136a90 100644 (file)
@@ -599,6 +599,7 @@ void add_to_flist(int ft, int id, int parent)
 void append_pathname(pathname_t * name, char *str)
 {
        int len;
+       char *path;
 
        len = strlen(str);
 #ifdef DEBUG
@@ -609,7 +610,13 @@ void append_pathname(pathname_t * name, char *str)
 
        }
 #endif
-       name->path = realloc(name->path, name->len + 1 + len);
+       path = realloc(name->path, name->len + 1 + len);
+       if (path == NULL) {
+               fprintf(stderr, "fsstress: append_pathname realloc failed\n");
+               chdir(homedir);
+               abort();
+       }
+       name->path = path;
        strcpy(&name->path[name->len], str);
        name->len += len;
 }