From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Lukáš Doktor" <ldoktor@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Amador Pahim" <apahim@redhat.com>
Subject: [Qemu-devel] [PULL 02/15] qemu|qtest: Avoid dangerous arguments
Date: Fri, 15 Sep 2017 20:37:26 -0300 [thread overview]
Message-ID: <20170915233739.26860-3-ehabkost@redhat.com> (raw)
In-Reply-To: <20170915233739.26860-1-ehabkost@redhat.com>
From: Lukáš Doktor <ldoktor@redhat.com>
The list object is mutable in python and potentially might modify other
object's arguments when used as default argument. Reproducer:
>>> vm1 = QEMUMachine("qemu")
>>> vm2 = QEMUMachine("qemu")
>>> vm1._wrapper.append("foo")
>>> print vm2._wrapper
['foo']
In this case the `args` is actually copied so it would be safe to keep
it, but it's not a good practice to keep it. The same issue applies in
inherited qtest module.
Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-Id: <20170818142613.32394-3-ldoktor@redhat.com>
Reviewed-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qemu.py | 6 +++++-
scripts/qtest.py | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index b45e691538..afd98a290e 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -30,7 +30,7 @@ class QEMUMachine(object):
# vm is guaranteed to be shut down here
'''
- def __init__(self, binary, args=[], wrapper=[], name=None,
+ def __init__(self, binary, args=None, wrapper=None, name=None,
test_dir="/var/tmp", monitor_address=None,
socket_scm_helper=None, debug=False):
'''
@@ -46,6 +46,10 @@ class QEMUMachine(object):
@param debug: enable debug mode
@note: Qemu process is not started until launch() is used.
'''
+ if args is None:
+ args = []
+ if wrapper is None:
+ wrapper = []
if name is None:
name = "qemu-%d" % os.getpid()
if monitor_address is None:
diff --git a/scripts/qtest.py b/scripts/qtest.py
index d5aecb5f49..ab183c0635 100644
--- a/scripts/qtest.py
+++ b/scripts/qtest.py
@@ -79,7 +79,7 @@ class QEMUQtestProtocol(object):
class QEMUQtestMachine(qemu.QEMUMachine):
'''A QEMU VM'''
- def __init__(self, binary, args=[], name=None, test_dir="/var/tmp",
+ def __init__(self, binary, args=None, name=None, test_dir="/var/tmp",
socket_scm_helper=None):
if name is None:
name = "qemu-%d" % os.getpid()
--
2.13.5
next prev parent reply other threads:[~2017-09-15 23:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-15 23:37 [Qemu-devel] [PULL 00/15] Python queue, 2017-09-15 Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 01/15] qemu.py: Pylint/style fixes Eduardo Habkost
2017-09-15 23:37 ` Eduardo Habkost [this message]
2017-09-15 23:37 ` [Qemu-devel] [PULL 03/15] qemu.py: Use iteritems rather than keys() Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 04/15] qemu.py: Simplify QMP key-conversion Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 05/15] qemu.py: Use custom exceptions rather than Exception Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 06/15] qmp.py: Couple of pylint/style fixes Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 07/15] qmp.py: Use object-based class for QEMUMonitorProtocol Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 08/15] qmp.py: Avoid "has_key" usage Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 09/15] qmp.py: Avoid overriding a builtin object Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 10/15] qtest.py: Few pylint/style fixes Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 11/15] qemu.py: fix is_running() return before first launch() Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 12/15] qemu.py: avoid writing to stdout/stderr Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 13/15] qemu.py: use os.path.null instead of /dev/null Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 14/15] qemu.py: improve message on negative exit code Eduardo Habkost
2017-09-18 9:44 ` Daniel P. Berrange
2017-09-18 11:46 ` Eduardo Habkost
2017-09-15 23:37 ` [Qemu-devel] [PULL 15/15] qemu.py: include debug information on launch error Eduardo Habkost
2017-09-16 14:25 ` [Qemu-devel] [PULL 00/15] Python queue, 2017-09-15 Peter Maydell
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=20170915233739.26860-3-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=apahim@redhat.com \
--cc=ldoktor@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.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 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).