aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <drake@endlessm.com>2019-01-07 11:40:24 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-31 08:14:39 +0100
commited334be9c2ed75b6fc348f5560f69cc418750c6b (patch)
tree5d3d937f1596de3cd3232e3a0d9ba833aa39137d
parent334c0e1b3cdd6dfbfd319dca47c3d0a1b17be896 (diff)
downloadlinux-yocto-ed334be9c2ed75b6fc348f5560f69cc418750c6b.tar.gz
linux-yocto-ed334be9c2ed75b6fc348f5560f69cc418750c6b.tar.bz2
linux-yocto-ed334be9c2ed75b6fc348f5560f69cc418750c6b.zip
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: 5bfce5ef55cb ("x86, kaslr: Provide randomness functions") Signed-off-by: Daniel Drake <drake@endlessm.com> Signed-off-by: Thomas 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/lib/kaslr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lib/kaslr.c b/arch/x86/lib/kaslr.c
index 79778ab200e4..a53665116458 100644
--- a/arch/x86/lib/kaslr.c
+++ b/arch/x86/lib/kaslr.c
@@ -36,8 +36,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;