#include <string.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <syslog.h>
#include <libgen.h>
#include <glob.h>
#include <elf.h>
#include <libubox/avl.h>
#include <libubox/avl-cmp.h>
#include <libubox/utils.h>
+#include <libubox/ulog.h>
#define DEF_MOD_PATH "/modules/%s/"
-#define INFO(fmt, ...) do { \
- syslog(LOG_INFO, fmt, ## __VA_ARGS__); \
- printf("kmod: "fmt, ## __VA_ARGS__); \
- } while (0)
-#define ERROR(fmt, ...) do { \
- syslog(LOG_ERR, fmt, ## __VA_ARGS__); \
- fprintf(stderr,"kmod: "fmt, ## __VA_ARGS__); \
- } while (0)
-#define DEBUG(fmt, ...) do { \
- syslog(LOG_DEBUG, fmt, ## __VA_ARGS__); \
- } while (0)
-
-
enum {
SCANNED,
PROBE,
else if (clazz == ELFCLASS64)
return elf64_find_section(map, section, offset, size);
- ERROR("unknown elf format %d\n", clazz);
+ ULOG_ERR("unknown elf format %d\n", clazz);
return -1;
}
fp = fopen("/proc/modules", "r");
if (!fp) {
- ERROR("failed to open /proc/modules\n");
+ ULOG_ERR("failed to open /proc/modules\n");
return -1;
}
{
int fd = open(module, O_RDONLY);
unsigned int offset, size;
- char *map, *strings, *dep = NULL;
- struct module *m;
+ char *map = MAP_FAILED, *strings, *dep = NULL;
+ struct module *m = NULL;
struct stat s;
- if (!fd) {
- ERROR("failed to open %s\n", module);
- return NULL;
+ if (fd < 0) {
+ ULOG_ERR("failed to open %s\n", module);
+ goto out;
}
if (fstat(fd, &s) == -1) {
- ERROR("failed to stat %s\n", module);
- return NULL;
+ ULOG_ERR("failed to stat %s\n", module);
+ goto out;
}
map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (map == MAP_FAILED) {
- ERROR("failed to mmap %s\n", module);
- return NULL;
+ ULOG_ERR("failed to mmap %s\n", module);
+ goto out;
}
if (elf_find_section(map, ".modinfo", &offset, &size)) {
- ERROR("failed to load the .modinfo section from %s\n", module);
- return NULL;
+ ULOG_ERR("failed to load the .modinfo section from %s\n", module);
+ goto out;
}
strings = map + offset;
}
m = alloc_module(name, dep, s.st_size);
- if (!m)
- return NULL;
- m->state = SCANNED;
+ if (m)
+ m->state = SCANNED;
+
+out:
+ if (map != MAP_FAILED)
+ munmap(map, s.st_size);
+
+ if (fd >= 0)
+ close(fd);
return m;
}
int fd = open(module, O_RDONLY);
unsigned int offset, size;
struct stat s;
- char *map, *strings;
+ char *map = MAP_FAILED, *strings;
+ int rv = -1;
- if (!fd) {
- ERROR("failed to open %s\n", module);
- return -1;
+ if (fd < 0) {
+ ULOG_ERR("failed to open %s\n", module);
+ goto out;
}
if (fstat(fd, &s) == -1) {
- ERROR("failed to stat %s\n", module);
- return -1;
+ ULOG_ERR("failed to stat %s\n", module);
+ goto out;
}
map = mmap(NULL, s.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if (map == MAP_FAILED) {
- ERROR("failed to mmap %s\n", module);
- return -1;
+ ULOG_ERR("failed to mmap %s\n", module);
+ goto out;
}
if (elf_find_section(map, ".modinfo", &offset, &size)) {
- ERROR("failed to load the .modinfo section from %s\n", module);
- return -1;
+ ULOG_ERR("failed to load the .modinfo section from %s\n", module);
+ goto out;
}
strings = map + offset;
free(dup);
}
- return 0;
+ rv = 0;
+
+out:
+ if (map != MAP_FAILED)
+ munmap(map, s.st_size);
+
+ if (fd >= 0)
+ close(fd);
+
+ return rv;
}
static int deps_available(struct module *m, int verbose)
char *dep;
int err = 0;
- if (!strcmp(m->depends, "-") || !strcmp(m->depends, ""))
+ if (!m->depends || !strcmp(m->depends, "-") || !strcmp(m->depends, ""))
return 0;
dep = m->depends;
m = find_module(dep);
if (verbose && !m)
- ERROR("missing dependency %s\n", dep);
+ ULOG_ERR("missing dependency %s\n", dep);
if (verbose && m && (m->state != LOADED))
- ERROR("dependency not loaded %s\n", dep);
+ ULOG_ERR("dependency not loaded %s\n", dep);
if (!m || (m->state != LOADED))
err++;
dep += strlen(dep) + 1;
int fd, ret = -1;
if (stat(path, &s)) {
- ERROR("missing module %s\n", path);
+ ULOG_ERR("missing module %s\n", path);
return ret;
}
fd = open(path, O_RDONLY);
- if (!fd) {
- ERROR("cannot open %s\n", path);
+ if (fd < 0) {
+ ULOG_ERR("cannot open %s\n", path);
return ret;
}
if (read(fd, data, s.st_size) == s.st_size)
ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options);
else
- ERROR("failed to read full module %s\n", path);
+ ULOG_ERR("failed to read full module %s\n", path);
close(fd);
free(data);
m = find_module(dep);
if (!m)
- ERROR("failed to find dependency %s\n", dep);
+ ULOG_ERR("failed to find dependency %s\n", dep);
if (m && (m->state != LOADED)) {
m->state = PROBE;
load_moddeps(m);
static int print_insmod_usage(void)
{
- INFO("Usage:\n\tinsmod filename [args]\n");
+ ULOG_INFO("Usage:\n\tinsmod filename [args]\n");
return -1;
}
static int print_usage(char *arg)
{
- INFO("Usage:\n\t%s module\n", arg);
+ ULOG_INFO("Usage:\n\t%s module\n", arg);
return -1;
}
name = get_module_name(argv[1]);
if (!name) {
- ERROR("cannot find module - %s\n", argv[1]);
+ ULOG_ERR("cannot find module - %s\n", argv[1]);
return -1;
}
return -1;
if (find_module(name)) {
- ERROR("module is already loaded - %s\n", name);
+ ULOG_ERR("module is already loaded - %s\n", name);
return -1;
}
cur += sprintf(cur, "%s", argv[i]);
}
+ if (init_module_folders()) {
+ fprintf(stderr, "Failed to find the folder holding the modules\n");
+ return -1;
+ }
+
if (get_module_path(argv[1])) {
name = argv[1];
} else if (!get_module_path(name)) {
free(options);
if (ret)
- ERROR("failed to insert %s\n", get_module_path(name));
+ ULOG_ERR("failed to insert %s\n", get_module_path(name));
return ret;
}
name = get_module_name(argv[1]);
m = find_module(name);
if (!m) {
- ERROR("module is not loaded\n");
+ ULOG_ERR("module is not loaded\n");
return -1;
}
ret = syscall(__NR_delete_module, m->name, 0);
if (ret)
- ERROR("unloading the module failed\n");
+ ULOG_ERR("unloading the module failed\n");
free_modules();
static int main_lsmod(int argc, char **argv)
{
struct module *m;
+ char *dep;
if (scan_loaded_modules())
return -1;
avl_for_each_element(&modules, m, avl)
- if (m->state == LOADED)
- printf("%-20s%8d%3d %s\n",
- m->name, m->size, m->usage,
- (*m->depends == '-') ? ("") : (m->depends));
+ if (m->state == LOADED) {
+ printf("%-20s%8d%3d ",
+ m->name, m->size, m->usage);
+ if (m->depends && strcmp(m->depends, "-") && strcmp(m->depends, "")) {
+ dep = m->depends;
+ while (*dep) {
+ printf("%s", dep);
+ dep = dep + strlen(dep) + 1;
+ if (*dep)
+ printf(",");
+ }
+ }
+ printf("\n");
+ }
free_modules();
name = get_module_name(argv[1]);
m = find_module(name);
if (!m) {
- ERROR("cannot find module - %s\n", argv[1]);
+ ULOG_ERR("cannot find module - %s\n", argv[1]);
return -1;
}
name = get_module_path(m->name);
if (!name) {
- ERROR("cannot find path of module - %s\n", m->name);
+ ULOG_ERR("cannot find path of module - %s\n", m->name);
return -1;
}
{
struct module *m;
char *name;
+ char *mod = NULL;
+ int i;
- if (argc != 2)
+ for (i = 1; i < argc; i++)
+ if (argv[i][0] != '-') {
+ mod = argv[i];
+ break;
+ }
+ if (!mod)
return print_usage("modprobe");
if (scan_loaded_modules())
if (scan_module_folders())
return -1;
- name = get_module_name(argv[1]);
+ name = get_module_name(mod);
m = find_module(name);
if (m && m->state == LOADED) {
- ERROR("%s is already loaded\n", name);
+ ULOG_ERR("%s is already loaded\n", name);
return -1;
} else if (!m) {
- ERROR("failed to find a module named %s\n", name);
+ ULOG_ERR("failed to find a module named %s\n", name);
} else {
int fail;
fail = load_modprobe();
if (fail) {
- ERROR("%d module%s could not be probed\n",
- fail, (fail == 1) ? ("") : ("s"));
+ ULOG_ERR("%d module%s could not be probed\n",
+ fail, (fail == 1) ? ("") : ("s"));
avl_for_each_element(&modules, m, avl)
if ((m->state == PROBE) || m->error)
- ERROR("- %s\n", m->name);
+ ULOG_ERR("- %s\n", m->name);
}
}
static int main_loader(int argc, char **argv)
{
int gl_flags = GLOB_NOESCAPE | GLOB_MARK;
- char *dir = "/etc/modules.d/*";
+ char *dir = "/etc/modules.d/";
struct module *m;
glob_t gl;
char *path;
strcpy(path, dir);
strcat(path, "*");
- if (scan_loaded_modules())
+ if (scan_loaded_modules()) {
+ free (path);
return -1;
+ }
- if (scan_module_folders())
+ if (scan_module_folders()) {
+ free (path);
return -1;
+ }
- syslog(0, "kmodloader: loading kernel modules from %s\n", path);
+ ULOG_INFO("loading kernel modules from %s\n", path);
if (glob(path, gl_flags, NULL, &gl) < 0)
goto out;
char *mod = NULL;
if (!fp) {
- ERROR("failed to open %s\n", gl.gl_pathv[j]);
+ ULOG_ERR("failed to open %s\n", gl.gl_pathv[j]);
continue;
}
}
fail = load_modprobe();
- DEBUG("ran %d iterations\n", iterations);
if (fail) {
- ERROR("%d module%s could not be probed\n",
- fail, (fail == 1) ? ("") : ("s"));
+ ULOG_ERR("%d module%s could not be probed\n",
+ fail, (fail == 1) ? ("") : ("s"));
avl_for_each_element(&modules, m, avl)
if ((m->state == PROBE) || (m->error))
- ERROR("- %s - %d\n", m->name, deps_available(m, 1));
+ ULOG_ERR("- %s - %d\n", m->name, deps_available(m, 1));
+ } else {
+ ULOG_INFO("done loading kernel modules from %s\n", path);
}
out:
if (!strcmp(exec, "modprobe"))
return main_modprobe(argc, argv);
+ ulog_open(ULOG_KMSG, LOG_USER, "kmodloader");
return main_loader(argc, argv);
}
projects / project / ubox.git / blobdiff