Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cfc8a29 authored by Daniel Drake's avatar Daniel Drake Committed by Greg Kroah-Hartman
Browse files

x86/kaslr: Fix incorrect i8254 outb() parameters 



commit 7e6fc2f50a3197d0e82d1c0e86282976c9e6c8a4 upstream.

The outb() function takes parameters value and port, in that order.  Fix
the parameters used in the kalsr i8254 fallback code.

Fixes: 5bfce5ef ("x86, kaslr: Provide randomness functions")
Signed-off-by: default avatarDaniel Drake <drake@endlessm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Cc: linux@endlessm.com
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20190107034024.15005-1-drake@endlessm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc6455e9

arch/x86/lib/kaslr.c

+2 −2
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ static inline u16 i8254(void) 
	u16 status, timer;



	do {

		outb(I8254_PORT_CONTROL,

		     I8254_CMD_READBACK | I8254_SELECT_COUNTER0);

		outb(I8254_CMD_READBACK | I8254_SELECT_COUNTER0,

		     I8254_PORT_CONTROL);

		status = inb(I8254_PORT_COUNTER0);

		timer  = inb(I8254_PORT_COUNTER0);

		timer |= inb(I8254_PORT_COUNTER0) << 8;