Commit 1a65b15b authored by Michael Ellerman's avatar Michael Ellerman Committed by Marcelo Henrique Cerri

UBUNTU: SAUCE: rfi-flush: Fix the fallback flush to actually activate

CVE-2017-5754

BugLink: http://bugs.launchpad.net/bugs/1742772

Since we now have three nops, we need to branch further to get over
the nops to the branch to the fallback flush.

Instead of putting the branch in slot 1 and branching by 8, put it in
0 and branch all the way to keep it simple.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
parent c049d338
...@@ -129,8 +129,8 @@ void do_rfi_flush_fixups(enum l1d_flush_type types) ...@@ -129,8 +129,8 @@ void do_rfi_flush_fixups(enum l1d_flush_type types)
instrs[2] = 0x60000000; /* nop */ instrs[2] = 0x60000000; /* nop */
if (types & L1D_FLUSH_FALLBACK) if (types & L1D_FLUSH_FALLBACK)
/* b .+8 to fallback flush */ /* b .+16 to fallback flush */
instrs[1] = 0x48000008; instrs[0] = 0x48000010;
i = 0; i = 0;
if (types & L1D_FLUSH_ORI) { if (types & L1D_FLUSH_ORI) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment