From: Eduardo Otubo <otubo@redhat.com>
To: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Cc: qemu-trivial@nongnu.org, lizhijian@cn.fujitsu.com,
mjt@tls.msk.ru, qemu-devel@nongnu.org
Subject: Re: [Qemu-trivial] [PATCH] filter-mirror: segfault when specifying non existent device
Date: Fri, 29 Sep 2017 12:57:01 +0200 [thread overview]
Message-ID: <20170929105701.GA22364@vader> (raw)
In-Reply-To: <45e8e004-5a55-07a3-190b-c01106af5de4@cn.fujitsu.com>
On Tue, Aug 22, 2017 at 09:19:20AM +0800, Zhang Chen wrote:
>
>
> On 08/21/2017 11:50 PM, Eduardo Otubo wrote:
> > When using filter-mirror like the example below where the interface
> > 'ndev0' does not exist on the host, QEMU crashes into segmentation
> > fault.
> >
> > $ qemu-system-x86_64 -S -machine pc -netdev user,id=ndev0 -object filter-mirror,id=test-object,netdev=ndev0
> >
> > This happens because the function filter_mirror_setup() does not checks
> > if the device actually exists and still keep on processing calling
> > qemu_chr_find(). This patch fixes this issue.
> >
> > Signed-off-by: Eduardo Otubo <otubo@redhat.com>
>
> Looks good for me.
>
> Reviewed-by: Zhang Chen<zhangchen.fnst@cn.fujitsu.com>
>
> Thanks
> Zhang Chen
>
So Peter and Michael pointed that this patch didn't pass on make check causing
this:
qemu-system-x86_64: -object
filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0: Device
'qtest-bn0' not found
Broken pipe
GTester: last random seed: R02S4f1b7fb2da540e3e36e962f19f19ac65
(tests/test-filter-mirror:6059): GLib-CRITICAL **: g_hook_destroy_link:
assertion 'hook != NULL' failed
make: *** [/home/otubo/develop/qemu/otubo/tests/Makefile.include:847:
check-qtest-x86_64] Error 1
otubo@vader ~/develop/qemu/otubo netdev_segfault $ git show
> > ---
> > net/filter-mirror.c | 14 +++++++++++---
> > 1 file changed, 11 insertions(+), 3 deletions(-)
> >
> > diff --git a/net/filter-mirror.c b/net/filter-mirror.c
> > index 90e2c92337..e18a4b16a0 100644
> > --- a/net/filter-mirror.c
> > +++ b/net/filter-mirror.c
> > @@ -213,14 +213,22 @@ static void filter_mirror_setup(NetFilterState *nf, Error **errp)
> > MirrorState *s = FILTER_MIRROR(nf);
> > Chardev *chr;
> > + if (s->outdev == NULL) {
> > + goto err;
> > + }
> > +
> > chr = qemu_chr_find(s->outdev);
> > +
> > if (chr == NULL) {
> > - error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
> > - "Device '%s' not found", s->outdev);
> > - return;
> > + goto err;
> > }
> > qemu_chr_fe_init(&s->chr_out, chr, errp);
And the reason was there was no return after qemu_chr_fe_init, making it fatally
go to the "err:" label.
> > +
> > +err:
> > + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found",
> > + nf->netdev_id);
Also, "nf->netdev_id" wasn't the device not found, but "s->outdev"; which makes
sense to have two error messages here one for when Null and one for when it's
not found, otherwise we'd fall into not very clear error messages like:
qemu-system-x86_64: -object filter-mirror,id=test-object,netdev=ndev0: Device
'(null)' not found
I'm fixing all this and sending a v2 shortly.
Thanks for the review and tests.
--
Eduardo Otubo
Senior Software Engineer @ RedHat
WARNING: multiple messages have this Message-ID (diff)
From: Eduardo Otubo <otubo@redhat.com>
To: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Cc: qemu-trivial@nongnu.org, lizhijian@cn.fujitsu.com,
mjt@tls.msk.ru, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [Qemu-trivial] [PATCH] filter-mirror: segfault when specifying non existent device
Date: Fri, 29 Sep 2017 12:57:01 +0200 [thread overview]
Message-ID: <20170929105701.GA22364@vader> (raw)
In-Reply-To: <45e8e004-5a55-07a3-190b-c01106af5de4@cn.fujitsu.com>
On Tue, Aug 22, 2017 at 09:19:20AM +0800, Zhang Chen wrote:
>
>
> On 08/21/2017 11:50 PM, Eduardo Otubo wrote:
> > When using filter-mirror like the example below where the interface
> > 'ndev0' does not exist on the host, QEMU crashes into segmentation
> > fault.
> >
> > $ qemu-system-x86_64 -S -machine pc -netdev user,id=ndev0 -object filter-mirror,id=test-object,netdev=ndev0
> >
> > This happens because the function filter_mirror_setup() does not checks
> > if the device actually exists and still keep on processing calling
> > qemu_chr_find(). This patch fixes this issue.
> >
> > Signed-off-by: Eduardo Otubo <otubo@redhat.com>
>
> Looks good for me.
>
> Reviewed-by: Zhang Chen<zhangchen.fnst@cn.fujitsu.com>
>
> Thanks
> Zhang Chen
>
So Peter and Michael pointed that this patch didn't pass on make check causing
this:
qemu-system-x86_64: -object
filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0: Device
'qtest-bn0' not found
Broken pipe
GTester: last random seed: R02S4f1b7fb2da540e3e36e962f19f19ac65
(tests/test-filter-mirror:6059): GLib-CRITICAL **: g_hook_destroy_link:
assertion 'hook != NULL' failed
make: *** [/home/otubo/develop/qemu/otubo/tests/Makefile.include:847:
check-qtest-x86_64] Error 1
otubo@vader ~/develop/qemu/otubo netdev_segfault $ git show
> > ---
> > net/filter-mirror.c | 14 +++++++++++---
> > 1 file changed, 11 insertions(+), 3 deletions(-)
> >
> > diff --git a/net/filter-mirror.c b/net/filter-mirror.c
> > index 90e2c92337..e18a4b16a0 100644
> > --- a/net/filter-mirror.c
> > +++ b/net/filter-mirror.c
> > @@ -213,14 +213,22 @@ static void filter_mirror_setup(NetFilterState *nf, Error **errp)
> > MirrorState *s = FILTER_MIRROR(nf);
> > Chardev *chr;
> > + if (s->outdev == NULL) {
> > + goto err;
> > + }
> > +
> > chr = qemu_chr_find(s->outdev);
> > +
> > if (chr == NULL) {
> > - error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
> > - "Device '%s' not found", s->outdev);
> > - return;
> > + goto err;
> > }
> > qemu_chr_fe_init(&s->chr_out, chr, errp);
And the reason was there was no return after qemu_chr_fe_init, making it fatally
go to the "err:" label.
> > +
> > +err:
> > + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found",
> > + nf->netdev_id);
Also, "nf->netdev_id" wasn't the device not found, but "s->outdev"; which makes
sense to have two error messages here one for when Null and one for when it's
not found, otherwise we'd fall into not very clear error messages like:
qemu-system-x86_64: -object filter-mirror,id=test-object,netdev=ndev0: Device
'(null)' not found
I'm fixing all this and sending a v2 shortly.
Thanks for the review and tests.
--
Eduardo Otubo
Senior Software Engineer @ RedHat
next prev parent reply other threads:[~2017-09-29 10:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 15:50 [Qemu-trivial] [PATCH] filter-mirror: segfault when specifying non existent device Eduardo Otubo
2017-08-21 15:50 ` [Qemu-devel] " Eduardo Otubo
2017-08-22 1:19 ` [Qemu-trivial] " Zhang Chen
2017-08-22 1:19 ` [Qemu-devel] " Zhang Chen
2017-09-07 8:27 ` [Qemu-trivial] " Eduardo Otubo
2017-09-07 8:27 ` [Qemu-devel] " Eduardo Otubo
2017-09-29 10:57 ` Eduardo Otubo [this message]
2017-09-29 10:57 ` Eduardo Otubo
2017-09-14 7:50 ` Michael Tokarev
2017-09-14 7:50 ` [Qemu-devel] " Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170929105701.GA22364@vader \
--to=otubo@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=zhangchen.fnst@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.