diff options
| author | Kees Cook <keescook@chromium.org> | 2016-12-16 12:59:31 -0800 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2017-01-03 12:08:59 -0800 |
| commit | 9988f4d577f42f43b7612d755477585f35424af7 (patch) | |
| tree | 5467f7efe4219aef56b66ab3b086c6c818d4e59a | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| download | op-kernel-dev-9988f4d577f42f43b7612d755477585f35424af7.zip op-kernel-dev-9988f4d577f42f43b7612d755477585f35424af7.tar.gz | |
latent_entropy: fix ARM build error on earlier gcc
This fixes build errors seen on gcc-4.9.3 or gcc-5.3.1 for an ARM:
arm-soc/init/initramfs.c: In function 'error':
arm-soc/init/initramfs.c:50:1: error: unrecognizable insn:
}
^
(insn 26 25 27 5 (set (reg:SI 111 [ local_entropy.243 ])
(rotatert:SI (reg:SI 116 [ local_entropy.243 ])
(const_int -30 [0xffffffffffffffe2]))) -1
(nil))
Patch from PaX Team <pageexec@freemail.hu>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Reported-by: Brad Spengler <spender@grsecurity.net>
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | scripts/gcc-plugins/latent_entropy_plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/gcc-plugins/latent_entropy_plugin.c b/scripts/gcc-plugins/latent_entropy_plugin.c index 1254112..8ff203a 100644 --- a/scripts/gcc-plugins/latent_entropy_plugin.c +++ b/scripts/gcc-plugins/latent_entropy_plugin.c @@ -328,9 +328,9 @@ static enum tree_code get_op(tree *rhs) op = LROTATE_EXPR; /* * This code limits the value of random_const to - * the size of a wide int for the rotation + * the size of a long for the rotation */ - random_const &= HOST_BITS_PER_WIDE_INT - 1; + random_const %= TYPE_PRECISION(long_unsigned_type_node); break; } |
