From c54a4aeeb58c078ed64a12d0131a6c9ee3d793f6 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 6 May 2017 23:35:57 +0200 Subject: [PATCH] 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 --- src/lxc/commands.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lxc/commands.c b/src/lxc/commands.c index b17879b54..66c8aaeae 100644 --- 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) {