Fix pb-discover segfaults caused by list corruption.

[petitboot] / discover / parser.c

diff --git a/discover/parser.c b/discover/parser.c
index 74b2559c8ab9776d138bddc7a8ea51ef9625351d..9fe1925d94c44a283f0065f89f550401373b8347 100644 (file)
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -1,10 +1,9 @@
 
 #include <fcntl.h>
 #include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "types/types.h"
+#include <file/file.h>
 #include <log/log.h>
 #include <talloc/talloc.h>
 
@@ -12,7 +11,6 @@
 #include "parser.h"
 #include "parser-utils.h"
 #include "paths.h"
-#include "file.h"
 
 struct p_item {
        struct list_item list;
@@ -25,7 +23,7 @@ static char *local_path(struct discover_context *ctx,
                struct discover_device *dev,
                const char *filename)
 {
-       return join_paths(ctx, dev->mount_path, filename);
+       return join_paths(ctx, dev->root_path, filename);
 }
 
 int parser_request_file(struct discover_context *ctx,
@@ -49,23 +47,30 @@ int parser_request_file(struct discover_context *ctx,
        return rc;
 }
 
-int parser_check_dir(struct discover_context *ctx,
-               struct discover_device *dev, const char *dirname)
+int parser_stat_path(struct discover_context *ctx,
+               struct discover_device *dev, const char *path,
+               struct stat *statbuf)
 {
-       struct stat statbuf;
-       char *path;
-       int rc;
+       int rc = -1;
+       char *full_path;
 
+       /* we only support local files at present */
        if (!dev->mount_path)
                return -1;
 
-       path = local_path(ctx, dev, dirname);
+       full_path = local_path(ctx, dev, path);
 
-       rc = stat(path, &statbuf);
-       if (!rc)
-               return -1;
+       rc = stat(full_path, statbuf);
+       if (rc) {
+               rc = -1;
+               goto out;
+       }
+
+       rc = 0;
+out:
+       talloc_free(full_path);
 
-       return S_ISDIR(statbuf.st_mode) ? 0 : -1;
+       return rc;
 }
 
 int parser_replace_file(struct discover_context *ctx,
@@ -123,6 +128,22 @@ out:
        return -1;
 }
 
+int parser_scandir(struct discover_context *ctx, const char *dirname,
+                  struct dirent ***files, int (*filter)(const struct dirent *),
+                  int (*comp)(const struct dirent **, const struct dirent **))
+{
+       char *path;
+       int n;
+
+       path = talloc_asprintf(ctx, "%s%s", ctx->device->mount_path, dirname);
+       if (!path)
+               return -1;
+
+       n = scandir(path, files, filter, comp);
+       talloc_free(path);
+       return n;
+}
+
 void iterate_parsers(struct discover_context *ctx)
 {
        struct p_item* i;