commands: avoid NULL pointer dereference

lxc_cmd_get_lxcpath() and lxc_cmd_get_name() both pass a nil pointer to fill_sock_name(). Make sure that they are not dereferenced. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

commands: avoid NULL pointer dereference
96267159 · Christian Brauner · Stéphane Graber · f0213547 · 96267159
Unverified Commit 96267159 authored May 06, 2017 by Christian Brauner Committed by Stéphane Graber May 09, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

commands.c src/lxc/commands.c +6 -1

No files found.
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -74,14 +74,19 @@

 lxc_log_define(lxc_commands, lxc);

-static int fill_sock_name(char *path, int len, const char *name,
+static int fill_sock_name(char *path, int len, const char *lxcname,
 			  const char *lxcpath, const char *hashed_sock_name)
 {
+	const char *name;
 	char *tmppath;
 	size_t tmplen;
 	uint64_t hash;
 	int ret;

+	name = lxcname;
+	if (!name)
+		name = "";
+
 	if (hashed_sock_name != NULL) {
 		ret = snprintf(path, len, "lxc/%s/command", hashed_sock_name);
 		if (ret < 0 || ret >= len) {