GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moveconfig: replace unsafe eval with asteval

Browse source 
Commit b237d358b4 ("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>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Markus Klotzbuecher 2020-02-12 20:46:44 +01:00 • committed by Tom Rini
parent 080cc0b1b3
commit b3192f48c1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/moveconfig.py
View file

@ -295,6 +295,7 @@ To see the complete list of supported options, run
""" """
import asteval
import collections import collections
import copy import copy
import difflib import difflib
@ -808,10 +809,11 @@ def try_expand(line):
return line return line
try: try:
aeval = asteval.Interpreter( usersyms=SIZES, minimal=True )
cfg, val = re.split("=", line) cfg, val = re.split("=", line)
val= val.strip('\"') val= val.strip('\"')
if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val): if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
newval = hex(eval(val, SIZES)) newval = hex(aeval(val))
print("\tExpanded expression %s to %s" % (val, newval)) print("\tExpanded expression %s to %s" % (val, newval))
return cfg+'='+newval return cfg+'='+newval
except: except: