[LEDE-DEV] [PATCH ubox 2/2] kmodloader: log error message in case of out of memory

Hans Dedecker dedeckeh at gmail.com
Thu Aug 31 05:08:11 PDT 2017


Log "out of memory" error message in case of OOM

Signed-off-by: Hans Dedecker <dedeckeh at gmail.com>
---
 kmodloader.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/kmodloader.c b/kmodloader.c
index 94cfc42..1b6488f 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -95,8 +95,10 @@ static int init_module_folders(void)
 		if (!stat(path, &st) && S_ISDIR(st.st_mode)) {
 			module_folders = realloc(module_folders, sizeof(p) * (n + 2));
 
-			if (!module_folders)
+			if (!module_folders) {
+				ULOG_ERR("out of memory\n");
 				return -1;
+			}
 
 			module_folders[n++] = strdup(path);
 		}
@@ -569,8 +571,10 @@ static int insert_module(char *path, const char *options)
 	}
 
 	data = malloc(s.st_size);
-	if (!data)
+	if (!data) {
+		ULOG_ERR("out of memory\n");
 		goto out;
+	}
 
 	if (read(fd, data, s.st_size) == s.st_size) {
 		ret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options);
@@ -703,6 +707,7 @@ static int main_insmod(int argc, char **argv)
 
 	options = malloc(len);
 	if (!options) {
+		ULOG_ERR("out of memory\n");
 		ret = -1;
 		goto err;
 	}
@@ -912,8 +917,10 @@ static int main_loader(int argc, char **argv)
 		dir = argv[1];
 
 	path = malloc(strlen(dir) + 2);
-	if (!path)
+	if (!path) {
+		ULOG_ERR("out of memory\n");
 		return -1;
+	}
 
 	strcpy(path, dir);
 	strcat(path, "*");
-- 
1.9.1




More information about the Lede-dev mailing list