From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A065C282C4 for ; Mon, 4 Feb 2019 10:38:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C017120815 for ; Mon, 4 Feb 2019 10:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276735; bh=ho4ujFNpMrlwqqKlPpVdpJkgfiN8cjoWc0fgUNOSRwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CjL0VAjYY3ZXlyZn6aVZ3Bijv5Oq+dSAfl835h/si2kRnB1GIrIto8F+whI0fQDJk uQroiUkSdIRoOlEifG483QO8sE+pVNIRm5SyYOnjO57DeT7JqPO/D1eH6PIbuBjesZ rxrFM0AySllGeRm33tMarrcc03K8yrd/MQmwIvio= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729545AbfBDKiy (ORCPT ); Mon, 4 Feb 2019 05:38:54 -0500 Received: from mail.kernel.org ([198.145.29.99]:36352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728678AbfBDKiv (ORCPT ); Mon, 4 Feb 2019 05:38:51 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9307A2070C; Mon, 4 Feb 2019 10:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549276731; bh=ho4ujFNpMrlwqqKlPpVdpJkgfiN8cjoWc0fgUNOSRwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFMRDCdtb8OgABG+o1BFkdAO9MVE7cW18CILRSMeGwUmOcbe5a144oZrC4jv7mRvP ymOzn36eHup5WMeKtpxuXJHxfwwGoI3UHo0yzLpAKee3YFp+TW0/U9XZxjY9vW7UVT sCv8XDd3tCJemL2YaVg/6IELuNG7+JuEKwwkUEIs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Daniel Drake , Thomas Gleixner , bp@alien8.de, hpa@zytor.com, linux@endlessm.com Subject: [PATCH 3.18 10/31] x86/kaslr: Fix incorrect i8254 outb() parameters Date: Mon, 4 Feb 2019 11:36:25 +0100 Message-Id: <20190204103600.056618771@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103557.903263774@linuxfoundation.org> References: <20190204103557.903263774@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Drake 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 Signed-off-by: Thomas Gleixner 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 --- arch/x86/boot/compressed/aslr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/boot/compressed/aslr.c +++ b/arch/x86/boot/compressed/aslr.c @@ -24,8 +24,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;