From: Markus Klotzbuecher <mk@mkio.de>
To: u-boot@lists.denx.de
Subject: [PATCH 1/2] moveconfig: replace unsafe eval with asteval
Date: Wed, 12 Feb 2020 20:46:44 +0100 [thread overview]
Message-ID: <20200212194645.1765445-2-mk@mkio.de> (raw)
In-Reply-To: <20200212194645.1765445-1-mk@mkio.de>
Commit b237d358b "moveconfig: expand simple expressions" added support
for expanding expressions in configs, but used the unsafe python
built-in "eval". This patch fixes this by replacing eval with the
asteval module.
Signed-off-by: Markus Klotzbuecher <mk@mkio.de>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
---
tools/moveconfig.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 36160a3977..df20ec66af 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -295,6 +295,7 @@ To see the complete list of supported options, run
"""
+import asteval
import collections
import copy
import difflib
@@ -808,10 +809,11 @@ def try_expand(line):
return line
try:
+ aeval = asteval.Interpreter( usersyms=SIZES, minimal=True )
cfg, val = re.split("=", line)
val= val.strip('\"')
if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
- newval = hex(eval(val, SIZES))
+ newval = hex(aeval(val))
print("\tExpanded expression %s to %s" % (val, newval))
return cfg+'='+newval
except:
--
2.25.0
next prev parent reply other threads:[~2020-02-12 19:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 19:46 [PATCH 0/2] moveconfig fixes Markus Klotzbuecher
2020-02-12 19:46 ` Markus Klotzbuecher [this message]
2020-02-12 22:14 ` [PATCH 1/2] moveconfig: replace unsafe eval with asteval Heinrich Schuchardt
2020-02-25 19:00 ` Tom Rini
2020-02-12 19:46 ` [PATCH 2/2] moveconfig: convert ps.stderr to string Markus Klotzbuecher
2020-02-16 19:02 ` Simon Glass
2020-02-25 19:00 ` Tom Rini
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=20200212194645.1765445-2-mk@mkio.de \
--to=mk@mkio.de \
--cc=u-boot@lists.denx.de \
/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