From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XVyKQ-0000F0-R2 for qemu-devel@nongnu.org; Mon, 22 Sep 2014 03:46:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XVyKM-0004FG-7y for qemu-devel@nongnu.org; Mon, 22 Sep 2014 03:46:34 -0400 Received: from mail-we0-x22f.google.com ([2a00:1450:400c:c03::22f]:46393) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XVyKM-00048x-1X for qemu-devel@nongnu.org; Mon, 22 Sep 2014 03:46:30 -0400 Received: by mail-we0-f175.google.com with SMTP id u57so1577151wes.6 for ; Mon, 22 Sep 2014 00:46:24 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <541FD3CF.2040105@redhat.com> Date: Mon, 22 Sep 2014 09:46:23 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1411340664-26912-1-git-send-email-minyard@acm.org> <1411340664-26912-2-git-send-email-minyard@acm.org> In-Reply-To: <1411340664-26912-2-git-send-email-minyard@acm.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/6] qemu-char: Make the filename size for a chardev a #define List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: minyard@acm.org, qemu-devel@nongnu.org Cc: mjg59@srcf.ucam.org, mst@redhat.com, hwd@huawei.com, bcketchum@gmail.com, Corey Minyard , afaerber@suse.de Il 22/09/2014 01:04, minyard@acm.org ha scritto: > From: Corey Minyard > > Signed-off-by: Corey Minyard > --- > qemu-char.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/qemu-char.c b/qemu-char.c > index 2a3cb9f..39fb9e4 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -84,6 +84,7 @@ > > #define READ_BUF_LEN 4096 > #define READ_RETRIES 10 > +#define CHR_MAX_FILENAME_SIZE 256 > > /***********************************************************/ > /* character device */ > @@ -989,7 +990,8 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out) > static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts) > { > int fd_in, fd_out; > - char filename_in[256], filename_out[256]; > + char filename_in[CHR_MAX_FILENAME_SIZE]; > + char filename_out[CHR_MAX_FILENAME_SIZE]; > const char *filename = opts->device; > > if (filename == NULL) { > @@ -997,8 +999,8 @@ static CharDriverState *qemu_chr_open_pipe(ChardevHostdev *opts) > return NULL; > } > > - snprintf(filename_in, 256, "%s.in", filename); > - snprintf(filename_out, 256, "%s.out", filename); > + snprintf(filename_in, CHR_MAX_FILENAME_SIZE, "%s.in", filename); > + snprintf(filename_out, CHR_MAX_FILENAME_SIZE, "%s.out", filename); > TFR(fd_in = qemu_open(filename_in, O_RDWR | O_BINARY)); > TFR(fd_out = qemu_open(filename_out, O_RDWR | O_BINARY)); > if (fd_in < 0 || fd_out < 0) { > @@ -1968,7 +1970,7 @@ static int win_chr_pipe_init(CharDriverState *chr, const char *filename) > OVERLAPPED ov; > int ret; > DWORD size; > - char openname[256]; > + char openname[CHR_MAX_FILENAME_SIZE]; > > s->fpipe = TRUE; > > @@ -2910,12 +2912,12 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay, > s->write_msgfds = 0; > s->write_msgfds_num = 0; > > - chr->filename = g_malloc(256); > + chr->filename = g_malloc(CHR_MAX_FILENAME_SIZE); > switch (ss.ss_family) { > #ifndef _WIN32 > case AF_UNIX: > s->is_unix = 1; > - snprintf(chr->filename, 256, "unix:%s%s", > + snprintf(chr->filename, CHR_MAX_FILENAME_SIZE, "unix:%s%s", > ((struct sockaddr_un *)(&ss))->sun_path, > is_listen ? ",server" : ""); > break; > @@ -2928,7 +2930,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay, > s->do_nodelay = do_nodelay; > getnameinfo((struct sockaddr *) &ss, ss_len, host, sizeof(host), > serv, sizeof(serv), NI_NUMERICHOST | NI_NUMERICSERV); > - snprintf(chr->filename, 256, "%s:%s%s%s:%s%s", > + snprintf(chr->filename, CHR_MAX_FILENAME_SIZE, "%s:%s%s%s:%s%s", > is_telnet ? "telnet" : "tcp", > left, host, right, serv, > is_listen ? ",server" : ""); > Reviewed-by: Paolo Bonzini