From: Wei Liu Subject: Re: [PATCH 1/3] tools/libxl/libxl_qmp.c: Make sure sun_path is NULL terminated in qmp_open Date: Tue, 17 Mar 2015 15:42:08 +0000 Message-ID: <20150317154207.GB20522@zion.uk.xensource.com> References: <1426500338-36798-1-git-send-email-pramod.devendra@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YXth8-0006db-MG for xen-devel@lists.xenproject.org; Tue, 17 Mar 2015 15:46:14 +0000 Content-Disposition: inline In-Reply-To: <1426500338-36798-1-git-send-email-pramod.devendra@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: PRAMOD DEVENDRA Cc: xen-devel@lists.xenproject.org, Wei Liu , Ian Jackson , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org On Mon, Mar 16, 2015 at 10:05:38AM +0000, PRAMOD DEVENDRA wrote: > From: Pramod Devendra > > Signed-off-by: Pramod Devendra > CC: Ian Jackson > CC: Stefano Stabellini > CC: Ian Campbell > CC: Wei Liu > --- > tools/libxl/libxl_qmp.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c > index c7324e6..1080162 100644 > --- a/tools/libxl/libxl_qmp.c > +++ b/tools/libxl/libxl_qmp.c > @@ -369,10 +369,13 @@ static int qmp_open(libxl__qmp_handler *qmp, const char *qmp_socket_path, > ret = libxl_fd_set_cloexec(qmp->ctx, qmp->qmp_fd, 1); > if (ret) return -1; > > + if(sizeof (qmp->addr.sun_path) <= strlen(qmp_socket_path)) > + return -1; > + I know this is not your fault, but the function seems to leak qmp_fd on error path (qmp_fd is not closed). Do you fancy fixing that? Wei. > memset(&qmp->addr, 0, sizeof (qmp->addr)); > qmp->addr.sun_family = AF_UNIX; > strncpy(qmp->addr.sun_path, qmp_socket_path, > - sizeof (qmp->addr.sun_path)); > + sizeof (qmp->addr.sun_path)-1); > > do { > ret = connect(qmp->qmp_fd, (struct sockaddr *) &qmp->addr, > -- > 1.7.10.4