From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 3/4] tools/xenstored: Avoid buffer overflows while setting up sockets Date: Mon, 25 Nov 2013 11:07:43 +0000 Message-ID: <1385377664-20979-4-git-send-email-andrew.cooper3@citrix.com> References: <1385377664-20979-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1385377664-20979-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Coverity ID: 1055996 1056002 Use strncpy in preference to strcpy, and use the correct failing path for error messages. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson --- tools/xenstore/xenstored_core.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index ccfdaa3..3c13c64 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -1735,13 +1735,12 @@ static void init_sockets(int **psock, int **pro_sock) unlink(xs_daemon_socket_ro()); addr.sun_family = AF_UNIX; - strcpy(addr.sun_path, xs_daemon_socket()); + strncpy(addr.sun_path, xs_daemon_socket(), sizeof(addr.sun_path)); 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", addr.sun_path); + strncpy(addr.sun_path, xs_daemon_socket_ro(), sizeof(addr.sun_path)); if (bind(*ro_sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) - barf_perror("Could not bind socket to %s", - xs_daemon_socket_ro()); + barf_perror("Could not bind socket to %s", addr.sun_path); if (chmod(xs_daemon_socket(), 0600) != 0 || chmod(xs_daemon_socket_ro(), 0660) != 0) barf_perror("Could not chmod sockets"); -- 1.7.10.4