* [PATCH] 9pfs: simplify v9fs_walk()
@ 2021-05-16 15:55 Christian Schoenebeck
2021-05-17 11:35 ` [SPAM] " Greg Kurz
0 siblings, 1 reply; 3+ messages in thread
From: Christian Schoenebeck @ 2021-05-16 15:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Greg Kurz
There is only one comparison between nwnames and P9_MAXWELEM required.
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
hw/9pfs/9p.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 0fa776af09..89aa07db78 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1739,7 +1739,11 @@ static void coroutine_fn v9fs_walk(void *opaque)
trace_v9fs_walk(pdu->tag, pdu->id, fid, newfid, nwnames);
- if (nwnames && nwnames <= P9_MAXWELEM) {
+ if (nwnames > P9_MAXWELEM) {
+ err = -EINVAL;
+ goto out_nofid;
+ }
+ if (nwnames) {
wnames = g_new0(V9fsString, nwnames);
qids = g_new0(V9fsQID, nwnames);
for (i = 0; i < nwnames; i++) {
@@ -1753,9 +1757,6 @@ static void coroutine_fn v9fs_walk(void *opaque)
}
offset += err;
}
- } else if (nwnames > P9_MAXWELEM) {
- err = -EINVAL;
- goto out_nofid;
}
fidp = get_fid(pdu, fid);
if (fidp == NULL) {
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [SPAM] [PATCH] 9pfs: simplify v9fs_walk()
2021-05-16 15:55 [PATCH] 9pfs: simplify v9fs_walk() Christian Schoenebeck
@ 2021-05-17 11:35 ` Greg Kurz
2021-05-17 13:14 ` Christian Schoenebeck
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kurz @ 2021-05-17 11:35 UTC (permalink / raw)
To: Christian Schoenebeck; +Cc: qemu-devel
On Sun, 16 May 2021 17:55:34 +0200
Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> There is only one comparison between nwnames and P9_MAXWELEM required.
>
> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> ---
Nice catch. It's been there for a decade :)
Reviewed-by: Greg Kurz <groug@kaod.org>
> hw/9pfs/9p.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> index 0fa776af09..89aa07db78 100644
> --- a/hw/9pfs/9p.c
> +++ b/hw/9pfs/9p.c
> @@ -1739,7 +1739,11 @@ static void coroutine_fn v9fs_walk(void *opaque)
>
> trace_v9fs_walk(pdu->tag, pdu->id, fid, newfid, nwnames);
>
> - if (nwnames && nwnames <= P9_MAXWELEM) {
> + if (nwnames > P9_MAXWELEM) {
> + err = -EINVAL;
> + goto out_nofid;
> + }
> + if (nwnames) {
> wnames = g_new0(V9fsString, nwnames);
> qids = g_new0(V9fsQID, nwnames);
> for (i = 0; i < nwnames; i++) {
> @@ -1753,9 +1757,6 @@ static void coroutine_fn v9fs_walk(void *opaque)
> }
> offset += err;
> }
> - } else if (nwnames > P9_MAXWELEM) {
> - err = -EINVAL;
> - goto out_nofid;
> }
> fidp = get_fid(pdu, fid);
> if (fidp == NULL) {
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] 9pfs: simplify v9fs_walk()
2021-05-17 11:35 ` [SPAM] " Greg Kurz
@ 2021-05-17 13:14 ` Christian Schoenebeck
0 siblings, 0 replies; 3+ messages in thread
From: Christian Schoenebeck @ 2021-05-17 13:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Greg Kurz
On Montag, 17. Mai 2021 13:35:09 CEST Greg Kurz wrote:
> On Sun, 16 May 2021 17:55:34 +0200
>
> Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
> > There is only one comparison between nwnames and P9_MAXWELEM required.
> >
> > Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > ---
>
> Nice catch. It's been there for a decade :)
>
> Reviewed-by: Greg Kurz <groug@kaod.org>
Now that was a quick response! Queued, thanks!
https://github.com/cschoenebeck/qemu/commits/9p.next
>
> > hw/9pfs/9p.c | 9 +++++----
> > 1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
> > index 0fa776af09..89aa07db78 100644
> > --- a/hw/9pfs/9p.c
> > +++ b/hw/9pfs/9p.c
> > @@ -1739,7 +1739,11 @@ static void coroutine_fn v9fs_walk(void *opaque)
> >
> > trace_v9fs_walk(pdu->tag, pdu->id, fid, newfid, nwnames);
> >
> > - if (nwnames && nwnames <= P9_MAXWELEM) {
> > + if (nwnames > P9_MAXWELEM) {
> > + err = -EINVAL;
> > + goto out_nofid;
> > + }
> > + if (nwnames) {
> >
> > wnames = g_new0(V9fsString, nwnames);
> > qids = g_new0(V9fsQID, nwnames);
> > for (i = 0; i < nwnames; i++) {
> >
> > @@ -1753,9 +1757,6 @@ static void coroutine_fn v9fs_walk(void *opaque)
> >
> > }
> > offset += err;
> >
> > }
> >
> > - } else if (nwnames > P9_MAXWELEM) {
> > - err = -EINVAL;
> > - goto out_nofid;
> >
> > }
> > fidp = get_fid(pdu, fid);
> > if (fidp == NULL) {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-17 13:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-16 15:55 [PATCH] 9pfs: simplify v9fs_walk() Christian Schoenebeck
2021-05-17 11:35 ` [SPAM] " Greg Kurz
2021-05-17 13:14 ` Christian Schoenebeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).