From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57719 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5D3W-0000Od-4f for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:16:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5D3U-0003WL-9Q for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:16:37 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:47409) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5D3T-0003UG-PO for qemu-devel@nongnu.org; Thu, 31 Mar 2011 04:16:36 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp08.au.ibm.com (8.14.4/8.13.1) with ESMTP id p2V8BKtw012957 for ; Thu, 31 Mar 2011 19:11:20 +1100 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p2V8GRNZ1601662 for ; Thu, 31 Mar 2011 19:16:27 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p2V8GQ4L017278 for ; Thu, 31 Mar 2011 19:16:27 +1100 Message-ID: <4D943858.1060706@linux.vnet.ibm.com> Date: Thu, 31 Mar 2011 13:46:24 +0530 From: Harsh Bora MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v2] v9fs_walk: As per 9p2000 RFC, MAXWELEM >= nwnames >= 0. References: <1300773090-27998-1-git-send-email-harsh@linux.vnet.ibm.com> In-Reply-To: <1300773090-27998-1-git-send-email-harsh@linux.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Harsh Prateek Bora Cc: stefanha@gmail.com, jvrao@linux.vnet.ibm.com, qemu-devel@nongnu.org Hi, Review comments / ACK please ? regards, Harsh On 03/22/2011 11:21 AM, Harsh Prateek Bora wrote: > 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. > > v2: > - Added check in v9fs_walk_complete as well. > > Signed-off-by: Harsh Prateek Bora > --- > hw/9pfs/virtio-9p.c | 7 +++++-- > hw/9pfs/virtio-9p.h | 2 +- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c > index 9b44bd0..dde51bc 100644 > --- a/hw/9pfs/virtio-9p.c > +++ b/hw/9pfs/virtio-9p.c > @@ -1708,7 +1708,7 @@ static void v9fs_walk_complete(V9fsState *s, V9fsWalkState *vs, int err) > { > complete_pdu(s, vs->pdu, err); > > - if (vs->nwnames) { > + if (vs->nwnames<= P9_MAXWELEM) { > for (vs->name_idx = 0; vs->name_idx< vs->nwnames; vs->name_idx++) { > v9fs_string_free(&vs->wnames[vs->name_idx]); > } > @@ -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;