UBUNTU: SAUCE: rfi-flush: Fix HRFI_TO_UNKNOWN

CVE-2017-5754

BugLink: http://bugs.launchpad.net/bugs/1742772
We forgot to expand the number of nops in HRFI_TO_UNKNOWN when we
expanded the number of nops. The result is we actually overwrite the
rfid with a nop, which is not good. Luckily this is only used in
denorm_done, which is not hit often.

Spotted by Ram.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 5c93872aa32d4311b4bc5b84a589c94d92805f9a..dd4b299a7fb5b996536bac021eb53e4984abface 100644 (file)
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -141,6 +141,8 @@
 #define HRFI_TO_UNKNOWN                                                        \
        RFI_FLUSH_FIXUP_SECTION;                                        \
        nop;                                                            \
+       nop;                                                            \
+       nop;                                                            \
        hrfid;                                                          \
        b       hrfi_flush_fallback