tools/xenstored: Avoid buffer overflows while setting up sockets

Coverity ID: 1055996 1056002

Cache the xs_daemon_socket{,_ro}() strings to save pointlessly
re-snprintf()'ing the same path, and add explicit size checks against
addr.sun_path before strcpy()'ing into it.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Matthew Daley <mattd@bugfuzz.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index ccfdaa39a7646a3303c8e39af7c0885e0cf6ade8..2324e537910383dcca8c9fff25f97d9816d46b8a 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1718,6 +1718,9 @@ static void init_sockets(int **psock, int **pro_sock)
 {
        struct sockaddr_un addr;
        int *sock, *ro_sock;
+       const char *soc_str = xs_daemon_socket();
+       const char *soc_str_ro = xs_daemon_socket_ro();
+
        /* Create sockets for them to listen to. */
        *psock = sock = talloc(talloc_autofree_context(), int);
        *sock = socket(PF_UNIX, SOCK_STREAM, 0);
@@ -1731,19 +1734,25 @@ static void init_sockets(int **psock, int **pro_sock)
        talloc_set_destructor(ro_sock, destroy_fd);
 
        /* FIXME: Be more sophisticated, don't mug running daemon. */
-       unlink(xs_daemon_socket());
-       unlink(xs_daemon_socket_ro());
+       unlink(soc_str);
+       unlink(soc_str_ro);
 
        addr.sun_family = AF_UNIX;
-       strcpy(addr.sun_path, xs_daemon_socket());
+
+       if(strlen(soc_str) >= sizeof(addr.sun_path))
+               barf_perror("socket string '%s' too long", soc_str);
+       strcpy(addr.sun_path, soc_str);
        if (bind(*sock, (struct sockaddr *)&addr, sizeof(addr)) != 0)
-               barf_perror("Could not bind socket to %s", xs_daemon_socket());
-       strcpy(addr.sun_path, xs_daemon_socket_ro());
+               barf_perror("Could not bind socket to %s", soc_str);
+
+       if(strlen(soc_str_ro) >= sizeof(addr.sun_path))
+               barf_perror("socket string '%s' too long", soc_str_ro);
+       strcpy(addr.sun_path, soc_str_ro);
        if (bind(*ro_sock, (struct sockaddr *)&addr, sizeof(addr)) != 0)
-               barf_perror("Could not bind socket to %s",
-                           xs_daemon_socket_ro());
-       if (chmod(xs_daemon_socket(), 0600) != 0
-           || chmod(xs_daemon_socket_ro(), 0660) != 0)
+               barf_perror("Could not bind socket to %s", soc_str_ro);
+
+       if (chmod(soc_str, 0600) != 0
+           || chmod(soc_str_ro, 0660) != 0)
                barf_perror("Could not chmod sockets");
 
        if (listen(*sock, 1) != 0