Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp10087036imu; Sun, 30 Dec 2018 12:24:43 -0800 (PST) X-Google-Smtp-Source: ALg8bN6qFzECdOkTgvQ1qI9QRba3MbZFhhVZcSsJkgXsritkUQPjSKTtSJSEjSZE5I5Zp/Md7jpm X-Received: by 2002:a17:902:48:: with SMTP id 66mr34131618pla.68.1546201483362; Sun, 30 Dec 2018 12:24:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546201483; cv=none; d=google.com; s=arc-20160816; b=kKtPsR4K5xT8+utXTIp/YBnORJw/cfxSsByc8APkWGTfQAZMjNbREzXSK1QPNSWuxa RJcC/ZK+TFc3nx6Ta3yx7+wfnw0xtLKxBjqj4rnT+RgHyx+jwkmSna80OxlLN62e/l6u YCAquXjvL0sfngO3XLb8UEtg5RXnWSj00SM9FRVOVsDO1dxkHiZT1Ex6XU5vvJ7S3t5r 36t0phSrnsS3W83nwX5tFt+M7l1u7xBAnEr5++YZj1flilssgH50Vy2aqc0u5lq4HnFM sfq/0DIHohen+d6uXUbsQsUy6sacw5e77lJInWW+LnrU5N9ljO74rquZCg0N4KBbwZqM +r5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=GFxCQCN1kJ6L0cZS+urKSzksGmTxEpgAd8yKJNN+Suc=; b=jQ1eilqJaF0FhBnscTs4yx+lqwoCMxszSRDlS6XTVogCsFK/u7SvhHZr990X72prQp a7W8Qyl4sdsisvBY7H9scQ6YnDjho5zegJIY29zQln7ysqPFGLLMfENFqBV6H05LFDvG Id9I3Z7uVCiL1VjutFJQgikADzvm7D7fjQwb/yYw/r/dkC2lLU8MoWyciD3fgRMMnEFY RbIOMCFo0ZxmmzNWp1k2JMg4DB4ojjL+dPFOUUo1AmU5mgYiSICy2b09hS+bg6OxzAMD M7jpNlmgH/j+uz2SYXD5furnNFNqx9udgHlvGa4WeB7Uc1F0BbhgiU30YQawkjGmH6S7 8ukw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x23si3169995pgk.272.2018.12.30.12.24.27; Sun, 30 Dec 2018 12:24:43 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gentoo.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726826AbeL3UXi (ORCPT + 99 others); Sun, 30 Dec 2018 15:23:38 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:50472 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726671AbeL3UXh (ORCPT ); Sun, 30 Dec 2018 15:23:37 -0500 Received: from sf.home (trofi-1-pt.tunnel.tserv1.lon2.ipv6.he.net [IPv6:2001:470:1f1c:a0f::2]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: slyfox) by smtp.gentoo.org (Postfix) with ESMTPSA id 18000335C47; Sun, 30 Dec 2018 20:23:36 +0000 (UTC) Received: by sf.home (Postfix, from userid 1000) id 5C74A22F24EF7; Sun, 30 Dec 2018 20:23:31 +0000 (GMT) From: Sergei Trofimovich To: Matt Turner , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sergei Trofimovich , "Dmitry V . Levin" , Richard Henderson , Ivan Kokshaysky Subject: [PATCH] alpha: fix page fault handling for r16-r18 targets Date: Sun, 30 Dec 2018 20:23:12 +0000 Message-Id: <20181230202312.7239-1-slyfox@gentoo.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix page fault handling code to fixup r16-r18 registers. Before the patch code had off-by-two registers bug. This bug caused overwriting of ps,pc,gp registers instead of fixing intended r16,r17,r18 (see `struct pt_regs`). More details: Initially Dmitry noticed a kernel bug as a failure on strace test suite. Test passes unmapped userspace pointer to io_submit: ```c #include #include #include #include int main(void) { unsigned long ctx = 0; if (syscall(__NR_io_setup, 1, &ctx)) err(1, "io_setup"); const size_t page_size = sysconf(_SC_PAGESIZE); const size_t size = page_size * 2; void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (MAP_FAILED == ptr) err(1, "mmap(%zu)", size); if (munmap(ptr, size)) err(1, "munmap"); syscall(__NR_io_submit, ctx, 1, ptr + page_size); syscall(__NR_io_destroy, ctx); return 0; } ``` Running this test causes kernel to crash when handling page fault: ``` Unable to handle kernel paging request at virtual address ffffffffffff9468 CPU 3 aio(26027): Oops 0 pc = [] ra = [] ps = 0000 Not tainted pc is at sys_io_submit+0x108/0x200 ra is at sys_io_submit+0x6c/0x200 v0 = fffffc00c58e6300 t0 = fffffffffffffff2 t1 = 000002000025e000 t2 = fffffc01f159fef8 t3 = fffffc0001009640 t4 = fffffc0000e0f6e0 t5 = 0000020001002e9e t6 = 4c41564e49452031 t7 = fffffc01f159c000 s0 = 0000000000000002 s1 = 000002000025e000 s2 = 0000000000000000 s3 = 0000000000000000 s4 = 0000000000000000 s5 = fffffffffffffff2 s6 = fffffc00c58e6300 a0 = fffffc00c58e6300 a1 = 0000000000000000 a2 = 000002000025e000 a3 = 00000200001ac260 a4 = 00000200001ac1e8 a5 = 0000000000000001 t8 = 0000000000000008 t9 = 000000011f8bce30 t10= 00000200001ac440 t11= 0000000000000000 pv = fffffc00006fd320 at = 0000000000000000 gp = 0000000000000000 sp = 00000000265fd174 Disabling lock debugging due to kernel taint Trace: [] entSys+0xa4/0xc0 ``` Here `gp` has invalid value. `gp is s overwritten by a fixup for the following page fault handler in `io_submit` syscall handler: ``` __se_sys_io_submit ... ldq a1,0(t1) bne t0,4280 <__se_sys_io_submit+0x180> ``` After a page fault `t0` should contain -EFALUT and `a1` is 0. Instead `gp` was overwritten in place of `a1`. This happens due to a off-by-two bug in `dpf_reg()` for `r16-r18` (aka `a0-a2`). I think the bug went unnoticed for a long time as `gp` is one of scratch registers. Any kernel function call would re-calculate `gp`. CC: Dmitry V. Levin CC: Richard Henderson CC: Ivan Kokshaysky CC: Matt Turner CC: linux-alpha@vger.kernel.org CC: linux-kernel@vger.kernel.org Reported-by: Dmitry V. Levin Bug: https://bugs.gentoo.org/672040 Signed-off-by: Sergei Trofimovich --- arch/alpha/mm/fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index d73dc473fbb9..188fc9256baf 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -78,7 +78,7 @@ __load_new_mm_context(struct mm_struct *next_mm) /* Macro for exception fixup code to access integer registers. */ #define dpf_reg(r) \ (((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 : \ - (r) <= 18 ? (r)+8 : (r)-10]) + (r) <= 18 ? (r)+10 : (r)-10]) asmlinkage void do_page_fault(unsigned long address, unsigned long mmcsr, -- 2.20.1