From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Mon, 17 Dec 2018 04:07:38 +0000 (-0800)
Subject: decodetree: Ensure build_tree does not include values outside insnmask
X-Git-Tag: v4.0.0-rc0~26^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b3186e38f00ae0cba36c096e3654f916699f336;p=thirdparty%2Fqemu.git

decodetree: Ensure build_tree does not include values outside insnmask

Reproduced with "scripts/decodetree.py /dev/null".

Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/scripts/decodetree.py b/scripts/decodetree.py
index 33e32ee87ff..e26d8253f23 100755
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -784,7 +784,7 @@ class Tree:
 
 def build_tree(pats, outerbits, outermask):
     # Find the intersection of all remaining fixedmask.
-    innermask = ~outermask
+    innermask = ~outermask & insnmask
     for i in pats:
         innermask &= i.fixedmask