[PATCHv2 2/2] ubox: fix GCC fanalyzer warnings

Rosen Penev rosenp at gmail.com
Mon Jul 18 15:12:38 PDT 2022


memory leaks and missing NULL checks.

Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 v2: remove null check for free
 kmodloader.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/kmodloader.c b/kmodloader.c
index 4b2ffa7..b2e7a8b 100644
--- a/kmodloader.c
+++ b/kmodloader.c
@@ -336,6 +336,11 @@ static int scan_loaded_modules(void)
 			/* possibly a module outside /lib/modules/<ver>/ */
 			n = alloc_module(m.name, NULL, 0, m.depends, m.size);
 		}
+		if (!n) {
+			ULOG_ERR("Failed to allocate memory for module\n");
+			return -1;
+		}
+
 		n->usage = m.usage;
 		n->state = LOADED;
 	}
@@ -583,6 +588,11 @@ static int insert_module(char *path, const char *options)
 	struct stat s;
 	int fd, ret = -1;
 
+	if (!path) {
+		ULOG_ERR("Path not specified\n");
+		return ret;
+	}
+
 	if (stat(path, &s)) {
 		ULOG_ERR("missing module %s\n", path);
 		return ret;
@@ -1164,6 +1174,8 @@ load_options(void)
 			continue;
 		}
 	}
+
+	fclose(f);
 }
 
 int main(int argc, char **argv)
-- 
2.36.1




More information about the openwrt-devel mailing list