linux-kernel - [PATCH] arm64: fix oops in concurrently setting insn

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <6C55A58E-6F30-4EDD-B943-421226DBC4AD@tencent.com>
Date:   Fri, 1 Jul 2022 02:27:17 +0000
From:   haibinzhang(张海斌) <haibinzhang@...cent.com>
To:     Catalin Marinas <catalin.marinas@....com>,
        Will Deacon <will@...nel.org>,
        Ard Biesheuvel <ardb@...nel.org>,
        Mark Rutland <mark.rutland@....com>,
        "linux-arm-kernel@...ts.infradead.org" 
        <linux-arm-kernel@...ts.infradead.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] arm64: fix oops in concurrently setting insn_emulation
 sysctls 

How to reproduce:
    launch two shell executions:
       #!/bin/bash
       while [ 1 ];
       do
           echo 1 > /proc/sys/abi/swp
       done

Oops info:
    Unable to handle kernel NULL pointer dereference at virtual address 0000000000000010
    Internal error: Oops: 96000006 [#1] SMP
    Call trace:
    update_insn_emulation_mode+0xc0/0x148
    emulation_proc_handler+0x64/0xb8
    proc_sys_call_handler+0x9c/0xf8
    proc_sys_write+0x18/0x20
    __vfs_write+0x20/0x48
    vfs_write+0xe4/0x1d0
    ksys_write+0x70/0xf8
    __arm64_sys_write+0x20/0x28
    el0_svc_common.constprop.0+0x7c/0x1c0
    el0_svc_handler+0x2c/0xa0
    el0_svc+0x8/0x200

emulation_proc_handler changes table->data for proc_dointvec_minmax
and so it isn't allowed to reenter before restoring table->data,
which isn't right now.
To fix this issue, Add mutal exclusion covering related code section.

Signed-off-by: Haibin Zhang <haibinzhang@...cent.com>
---
 arch/arm64/kernel/armv8_deprecated.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
index 6875a16..c519792 100644
--- a/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@ -207,8 +207,12 @@ static int emulation_proc_handler(struct ctl_table *table, int write,
 				  loff_t *ppos)
 {
 	int ret = 0;
-	struct insn_emulation *insn = (struct insn_emulation *) table->data;
-	enum insn_emulation_mode prev_mode = insn->current_mode;
+	struct insn_emulation *insn;
+	enum insn_emulation_mode prev_mode;
+
+	raw_spin_lock(&insn_emulation_lock);
+	insn = (struct insn_emulation *) table->data;
+	prev_mode = insn->current_mode;
 
 	table->data = &insn->current_mode;
 	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
@@ -224,6 +228,7 @@ static int emulation_proc_handler(struct ctl_table *table, int write,
 	}
 ret:
 	table->data = insn;
+	raw_spin_unlock(&insn_emulation_lock);
 	return ret;
 }
 
-- 
1.8.3.1