Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751632AbdGaSZ6 (ORCPT ); Mon, 31 Jul 2017 14:25:58 -0400 Received: from mail.qboosh.pl ([217.73.31.61]:48318 "EHLO mail.qboosh.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750877AbdGaSZ5 (ORCPT ); Mon, 31 Jul 2017 14:25:57 -0400 X-Greylist: delayed 470 seconds by postgrey-1.27 at vger.kernel.org; Mon, 31 Jul 2017 14:25:56 EDT Date: Mon, 31 Jul 2017 20:20:10 +0200 From: Jakub Bogusz To: linux-kernel@vger.kernel.org, mitr@volny.cz Subject: [PATCH] wistron_btns needs executable BIOS image Message-ID: <20170731182010.GA933@stranger.qboosh.pl> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="UugvWAfsgieZRqgk" Content-Disposition: inline User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1652 Lines: 53 --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello, This patch (originally agains 3.1x, now I updated include to build against 4.12.x) fixes winstron_btns module issue with calling BIOS functions in non-executable memory. Tested (on Linux 3.10.x and few later versions) on F-S Amilo 8210 laptop. -- Jakub Bogusz http://qboosh.pl/ --UugvWAfsgieZRqgk Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="linux-wistron-nx.patch" wistron_btns needs executable BIOS image. Signed-off-by: Jakub Bogusz --- linux-4.12/drivers/input/misc/wistron_btns.c.orig 2013-11-16 09:05:55.612742472 +0100 +++ linux-4.12/drivers/input/misc/wistron_btns.c 2013-11-16 09:24:37.356028732 +0100 @@ -33,6 +33,7 @@ #include #include #include +#include /* How often we poll keys - msecs */ #define POLL_INTERVAL_DEFAULT 500 /* when idle */ @@ -124,6 +125,7 @@ if (entry_point >= 0xF0000) { bios_code_map_base = base; bios_entry_point = bios_code_map_base + (entry_point & 0xFFFF); + set_memory_x((unsigned long)bios_code_map_base, 0x10000 >> PAGE_SHIFT); } else { iounmap(base); bios_code_map_base = ioremap(entry_point & ~0x3FFF, 0x4000); @@ -134,6 +136,7 @@ goto err; } bios_entry_point = bios_code_map_base + (entry_point & 0x3FFF); + set_memory_x((unsigned long)bios_code_map_base, 0x4000 >> PAGE_SHIFT); } /* The Windows driver maps 0x10000 bytes, we keep only one page... */ bios_data_map_base = ioremap(0x400, 0xc00); --UugvWAfsgieZRqgk--