From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52680) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBeC-0002vL-5W for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adBeB-0006V0-D7 for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44742) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adBeB-0006Ur-8t for qemu-devel@nongnu.org; Tue, 08 Mar 2016 02:01:35 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D53FE8051D for ; Tue, 8 Mar 2016 07:01:34 +0000 (UTC) From: Peter Xu Date: Tue, 8 Mar 2016 15:00:43 +0800 Message-Id: <1457420446-25276-6-git-send-email-peterx@redhat.com> In-Reply-To: <1457420446-25276-1-git-send-email-peterx@redhat.com> References: <1457420446-25276-1-git-send-email-peterx@redhat.com> Subject: [Qemu-devel] [PATCH 5/8] usb: fix unbounded stack for inotify_watchfn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Gerd Hoffmann , peterx@redhat.com Suggested-by: Paolo Bonzini CC: Gerd Hoffmann Signed-off-by: Peter Xu --- hw/usb/dev-mtp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 7391783..e6dae2f 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -432,13 +432,13 @@ static void inotify_watchfn(void *arg) { MTPState *s = arg; ssize_t bytes; +#define __BUF_LEN (sizeof(struct inotify_event) + NAME_MAX + 1) /* From the man page: atleast one event can be read */ - int len = sizeof(struct inotify_event) + NAME_MAX + 1; int pos; - char buf[len]; + char buf[__BUF_LEN]; for (;;) { - bytes = read(s->inotifyfd, buf, len); + bytes = read(s->inotifyfd, buf, __BUF_LEN); pos = 0; if (bytes <= 0) { @@ -534,6 +534,7 @@ static void inotify_watchfn(void *arg) } } } +#undef __BUF_LEN } static int usb_mtp_inotify_init(MTPState *s) -- 2.4.3