From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42903 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q1jtc-000158-Vm for qemu-devel@nongnu.org; Mon, 21 Mar 2011 14:32:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q1jtb-0007Pu-UD for qemu-devel@nongnu.org; Mon, 21 Mar 2011 14:32:04 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:40528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q1jtb-0007Pa-Cp for qemu-devel@nongnu.org; Mon, 21 Mar 2011 14:32:03 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp03.au.ibm.com (8.14.4/8.13.1) with ESMTP id p2LIRK37001577 for ; Tue, 22 Mar 2011 05:27:20 +1100 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2LIVxm72146490 for ; Tue, 22 Mar 2011 05:32:00 +1100 Received: from d23av02.au.ibm.com (loopback [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2LIVxmW000784 for ; Tue, 22 Mar 2011 05:31:59 +1100 From: Harsh Prateek Bora Date: Tue, 22 Mar 2011 00:01:55 +0530 Message-Id: <1300732315-1997-1-git-send-email-harsh@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] v9fs_walk: As per 9p2000 RFC, MAXWELEM >= nwnames >= 0. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Harsh Prateek Bora , jvrao@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com The nwnames field in TWALK message is assumed to be >=0 and <= MAXWELEM which is defined as macro P9_MAXWELEM (16) in virtio-9p.h as per 9p2000 RFC. Appropriate changes are required in V9fsWalkState and v9fs_walk. Signed-off-by: Harsh Prateek Bora --- hw/9pfs/virtio-9p.c | 5 ++++- hw/9pfs/virtio-9p.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 9b44bd0..b782a19 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -1805,7 +1805,7 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) vs->offset += pdu_unmarshal(vs->pdu, vs->offset, "ddw", &fid, &newfid, &vs->nwnames); - if (vs->nwnames) { + if (vs->nwnames <= P9_MAXWELEM) { vs->wnames = qemu_mallocz(sizeof(vs->wnames[0]) * vs->nwnames); vs->qids = qemu_mallocz(sizeof(vs->qids[0]) * vs->nwnames); @@ -1814,6 +1814,9 @@ static void v9fs_walk(V9fsState *s, V9fsPDU *pdu) vs->offset += pdu_unmarshal(vs->pdu, vs->offset, "s", &vs->wnames[i]); } + } else { + err = -EINVAL; + goto out; } vs->fidp = lookup_fid(s, fid); diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index e7d2326..119b12c 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -307,7 +307,7 @@ typedef struct V9fsStatStateDotl { typedef struct V9fsWalkState { V9fsPDU *pdu; size_t offset; - int16_t nwnames; + uint16_t nwnames; int name_idx; V9fsQID *qids; V9fsFidState *fidp; -- 1.7.1.1