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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68285C19F2A for ; Mon, 8 Aug 2022 01:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243786AbiHHB7Z (ORCPT ); Sun, 7 Aug 2022 21:59:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243873AbiHHB42 (ORCPT ); Sun, 7 Aug 2022 21:56:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E6DE101C4; Sun, 7 Aug 2022 18:39:52 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E8207B80DCF; Mon, 8 Aug 2022 01:39:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94735C433C1; Mon, 8 Aug 2022 01:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922789; bh=5F9RsjFgVNOGiSc2oDB5+Far0a7iC5ApU7VDGncrxM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rip499L8UC10RGHWpHLRb9PiinkKk9LVVJXiwp6H9R8CN87CRRzciaNwshWoVckuS 9jtdYTSLad3vEQ66J0UJsxICb6VfILVpHNHXi53jObT11SNkhhPAOmfZaA3dsd+tIx R/B1vyLw2XsU8stm+NDVU0Rm4vWomBrKsYuNXfbL5NvtSvpGHYZVPfHMvNbAaUaz0h /RNrGwgufRxEdqwPngRH3+GPGcNCUNubdydd6FXCD233ot5lSw6bj3ezefKew3Q0Ni GEMr1Ck/zEMcE9RSOOXP9QF4kGZz5WhxnpSPp9KDqlVtxik4NtIlNmYBIAO7Ev/cy0 BdXHdwPIfmcwQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?haibinzhang=20=28=E5=BC=A0=E6=B5=B7=E6=96=8C=29?= , hewenliang , Catalin Marinas , Will Deacon , Sasha Levin , mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 02/12] arm64: fix oops in concurrently setting insn_emulation sysctls Date: Sun, 7 Aug 2022 21:39:32 -0400 Message-Id: <20220808013943.316907-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013943.316907-1-sashal@kernel.org> References: <20220808013943.316907-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: haibinzhang (张海斌) [ Upstream commit af483947d472eccb79e42059276c4deed76f99a6 ] emulation_proc_handler() changes table->data for proc_dointvec_minmax and can generate the following Oops if called concurrently with itself: | 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 To fix this issue, keep the table->data as &insn->current_mode and use container_of() to retrieve the insn pointer. Another mutex is used to protect against the current_mode update but not for retrieving insn_emulation as table->data is no longer changing. Co-developed-by: hewenliang Signed-off-by: hewenliang Signed-off-by: Haibin Zhang Reviewed-by: Catalin Marinas Link: https://lore.kernel.org/r/20220128090324.2727688-1-hewenliang4@huawei.com Link: https://lore.kernel.org/r/9A004C03-250B-46C5-BF39-782D7551B00E@tencent.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/kernel/armv8_deprecated.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c index 092046704cbc..b82e32daaf66 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -63,6 +63,7 @@ struct insn_emulation { static LIST_HEAD(insn_emulation); static int nr_insn_emulated __initdata; static DEFINE_RAW_SPINLOCK(insn_emulation_lock); +static DEFINE_MUTEX(insn_emulation_mutex); static void register_emulation_hooks(struct insn_emulation_ops *ops) { @@ -208,10 +209,10 @@ 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; + struct insn_emulation *insn = container_of(table->data, struct insn_emulation, current_mode); enum insn_emulation_mode prev_mode = insn->current_mode; - table->data = &insn->current_mode; + mutex_lock(&insn_emulation_mutex); ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos); if (ret || !write || prev_mode == insn->current_mode) @@ -224,7 +225,7 @@ static int emulation_proc_handler(struct ctl_table *table, int write, update_insn_emulation_mode(insn, INSN_UNDEF); } ret: - table->data = insn; + mutex_unlock(&insn_emulation_mutex); return ret; } @@ -254,7 +255,7 @@ static void __init register_insn_emulation_sysctl(struct ctl_table *table) sysctl->maxlen = sizeof(int); sysctl->procname = insn->ops->name; - sysctl->data = insn; + sysctl->data = &insn->current_mode; sysctl->extra1 = &insn->min; sysctl->extra2 = &insn->max; sysctl->proc_handler = emulation_proc_handler; -- 2.35.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9A313C25B07 for ; Mon, 8 Aug 2022 02:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VPw3hCa1DqknymRoQ51KsZr4v7rV/mx09Y/gEWUTDqc=; b=m26F7XhxcxfNQc gHkTnOCz77HZjCYBcVsCif2W+ddPl2om6llI37DSc2JrO8sR8Wn/7z91tcFBB+vMI1mRdBNHmE2sR fb417BpKNSEXa5QIdgeUIF4Oe5ZKu3atVEPUhtQIp4cJbJpckOzzrAfuHeUzhYNysUzpmR1LXE4WV D/btL7ZDgwqJ19Yq4msXZu27Hc5z9d6Nhs4e0EX4WJ0LVbg8w+bPp8Raz8Ib5H54B0GF8N8/nNXkd pXx2RkmULnnyIYnAqsej3mAJdXUvD+58EWthVLAvV5A4l8QIxjPOmSvD5OVtmNrL0w1g5wi8rmpQX ck5/NxhQo6+ugd3uqqjQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKsqM-008C8c-L4; Mon, 08 Aug 2022 02:50:15 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oKrkG-007fWr-G9 for linux-arm-kernel@lists.infradead.org; Mon, 08 Aug 2022 01:39:54 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D1E87B80DC0; Mon, 8 Aug 2022 01:39:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94735C433C1; Mon, 8 Aug 2022 01:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1659922789; bh=5F9RsjFgVNOGiSc2oDB5+Far0a7iC5ApU7VDGncrxM0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rip499L8UC10RGHWpHLRb9PiinkKk9LVVJXiwp6H9R8CN87CRRzciaNwshWoVckuS 9jtdYTSLad3vEQ66J0UJsxICb6VfILVpHNHXi53jObT11SNkhhPAOmfZaA3dsd+tIx R/B1vyLw2XsU8stm+NDVU0Rm4vWomBrKsYuNXfbL5NvtSvpGHYZVPfHMvNbAaUaz0h /RNrGwgufRxEdqwPngRH3+GPGcNCUNubdydd6FXCD233ot5lSw6bj3ezefKew3Q0Ni GEMr1Ck/zEMcE9RSOOXP9QF4kGZz5WhxnpSPp9KDqlVtxik4NtIlNmYBIAO7Ev/cy0 BdXHdwPIfmcwQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?haibinzhang=20=28=E5=BC=A0=E6=B5=B7=E6=96=8C=29?= , hewenliang , Catalin Marinas , Will Deacon , Sasha Levin , mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 02/12] arm64: fix oops in concurrently setting insn_emulation sysctls Date: Sun, 7 Aug 2022 21:39:32 -0400 Message-Id: <20220808013943.316907-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013943.316907-1-sashal@kernel.org> References: <20220808013943.316907-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220807_183952_850803_F79DC7AA X-CRM114-Status: GOOD ( 14.80 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogaGFpYmluemhhbmcgKOW8oOa1t+aWjCkgPGhhaWJpbnpoYW5nQHRlbmNlbnQuY29tPgoK WyBVcHN0cmVhbSBjb21taXQgYWY0ODM5NDdkNDcyZWNjYjc5ZTQyMDU5Mjc2YzRkZWVkNzZmOTlh NiBdCgplbXVsYXRpb25fcHJvY19oYW5kbGVyKCkgY2hhbmdlcyB0YWJsZS0+ZGF0YSBmb3IgcHJv Y19kb2ludHZlY19taW5tYXgKYW5kIGNhbiBnZW5lcmF0ZSB0aGUgZm9sbG93aW5nIE9vcHMgaWYg Y2FsbGVkIGNvbmN1cnJlbnRseSB3aXRoIGl0c2VsZjoKCiB8IFVuYWJsZSB0byBoYW5kbGUga2Vy bmVsIE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZSBhdCB2aXJ0dWFsIGFkZHJlc3MgMDAwMDAwMDAw MDAwMDAxMAogfCBJbnRlcm5hbCBlcnJvcjogT29wczogOTYwMDAwMDYgWyMxXSBTTVAKIHwgQ2Fs bCB0cmFjZToKIHwgdXBkYXRlX2luc25fZW11bGF0aW9uX21vZGUrMHhjMC8weDE0OAogfCBlbXVs YXRpb25fcHJvY19oYW5kbGVyKzB4NjQvMHhiOAogfCBwcm9jX3N5c19jYWxsX2hhbmRsZXIrMHg5 Yy8weGY4CiB8IHByb2Nfc3lzX3dyaXRlKzB4MTgvMHgyMAogfCBfX3Zmc193cml0ZSsweDIwLzB4 NDgKIHwgdmZzX3dyaXRlKzB4ZTQvMHgxZDAKIHwga3N5c193cml0ZSsweDcwLzB4ZjgKIHwgX19h cm02NF9zeXNfd3JpdGUrMHgyMC8weDI4CiB8IGVsMF9zdmNfY29tbW9uLmNvbnN0cHJvcC4wKzB4 N2MvMHgxYzAKIHwgZWwwX3N2Y19oYW5kbGVyKzB4MmMvMHhhMAogfCBlbDBfc3ZjKzB4OC8weDIw MAoKVG8gZml4IHRoaXMgaXNzdWUsIGtlZXAgdGhlIHRhYmxlLT5kYXRhIGFzICZpbnNuLT5jdXJy ZW50X21vZGUgYW5kCnVzZSBjb250YWluZXJfb2YoKSB0byByZXRyaWV2ZSB0aGUgaW5zbiBwb2lu dGVyLiBBbm90aGVyIG11dGV4IGlzCnVzZWQgdG8gcHJvdGVjdCBhZ2FpbnN0IHRoZSBjdXJyZW50 X21vZGUgdXBkYXRlIGJ1dCBub3QgZm9yIHJldHJpZXZpbmcKaW5zbl9lbXVsYXRpb24gYXMgdGFi bGUtPmRhdGEgaXMgbm8gbG9uZ2VyIGNoYW5naW5nLgoKQ28tZGV2ZWxvcGVkLWJ5OiBoZXdlbmxp YW5nIDxoZXdlbmxpYW5nNEBodWF3ZWkuY29tPgpTaWduZWQtb2ZmLWJ5OiBoZXdlbmxpYW5nIDxo ZXdlbmxpYW5nNEBodWF3ZWkuY29tPgpTaWduZWQtb2ZmLWJ5OiBIYWliaW4gWmhhbmcgPGhhaWJp bnpoYW5nQHRlbmNlbnQuY29tPgpSZXZpZXdlZC1ieTogQ2F0YWxpbiBNYXJpbmFzIDxjYXRhbGlu Lm1hcmluYXNAYXJtLmNvbT4KTGluazogaHR0cHM6Ly9sb3JlLmtlcm5lbC5vcmcvci8yMDIyMDEy ODA5MDMyNC4yNzI3Njg4LTEtaGV3ZW5saWFuZzRAaHVhd2VpLmNvbQpMaW5rOiBodHRwczovL2xv cmUua2VybmVsLm9yZy9yLzlBMDA0QzAzLTI1MEItNDZDNS1CRjM5LTc4MkQ3NTUxQjAwRUB0ZW5j ZW50LmNvbQpTaWduZWQtb2ZmLWJ5OiBXaWxsIERlYWNvbiA8d2lsbEBrZXJuZWwub3JnPgpTaWdu ZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+Ci0tLQogYXJjaC9hcm02 NC9rZXJuZWwvYXJtdjhfZGVwcmVjYXRlZC5jIHwgOSArKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCA1IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9hcm02 NC9rZXJuZWwvYXJtdjhfZGVwcmVjYXRlZC5jIGIvYXJjaC9hcm02NC9rZXJuZWwvYXJtdjhfZGVw cmVjYXRlZC5jCmluZGV4IDA5MjA0NjcwNGNiYy4uYjgyZTMyZGFhZjY2IDEwMDY0NAotLS0gYS9h cmNoL2FybTY0L2tlcm5lbC9hcm12OF9kZXByZWNhdGVkLmMKKysrIGIvYXJjaC9hcm02NC9rZXJu ZWwvYXJtdjhfZGVwcmVjYXRlZC5jCkBAIC02Myw2ICs2Myw3IEBAIHN0cnVjdCBpbnNuX2VtdWxh dGlvbiB7CiBzdGF0aWMgTElTVF9IRUFEKGluc25fZW11bGF0aW9uKTsKIHN0YXRpYyBpbnQgbnJf aW5zbl9lbXVsYXRlZCBfX2luaXRkYXRhOwogc3RhdGljIERFRklORV9SQVdfU1BJTkxPQ0soaW5z bl9lbXVsYXRpb25fbG9jayk7CitzdGF0aWMgREVGSU5FX01VVEVYKGluc25fZW11bGF0aW9uX211 dGV4KTsKIAogc3RhdGljIHZvaWQgcmVnaXN0ZXJfZW11bGF0aW9uX2hvb2tzKHN0cnVjdCBpbnNu X2VtdWxhdGlvbl9vcHMgKm9wcykKIHsKQEAgLTIwOCwxMCArMjA5LDEwIEBAIHN0YXRpYyBpbnQg ZW11bGF0aW9uX3Byb2NfaGFuZGxlcihzdHJ1Y3QgY3RsX3RhYmxlICp0YWJsZSwgaW50IHdyaXRl LAogCQkJCSAgbG9mZl90ICpwcG9zKQogewogCWludCByZXQgPSAwOwotCXN0cnVjdCBpbnNuX2Vt dWxhdGlvbiAqaW5zbiA9IChzdHJ1Y3QgaW5zbl9lbXVsYXRpb24gKikgdGFibGUtPmRhdGE7CisJ c3RydWN0IGluc25fZW11bGF0aW9uICppbnNuID0gY29udGFpbmVyX29mKHRhYmxlLT5kYXRhLCBz dHJ1Y3QgaW5zbl9lbXVsYXRpb24sIGN1cnJlbnRfbW9kZSk7CiAJZW51bSBpbnNuX2VtdWxhdGlv bl9tb2RlIHByZXZfbW9kZSA9IGluc24tPmN1cnJlbnRfbW9kZTsKIAotCXRhYmxlLT5kYXRhID0g Jmluc24tPmN1cnJlbnRfbW9kZTsKKwltdXRleF9sb2NrKCZpbnNuX2VtdWxhdGlvbl9tdXRleCk7 CiAJcmV0ID0gcHJvY19kb2ludHZlY19taW5tYXgodGFibGUsIHdyaXRlLCBidWZmZXIsIGxlbnAs IHBwb3MpOwogCiAJaWYgKHJldCB8fCAhd3JpdGUgfHwgcHJldl9tb2RlID09IGluc24tPmN1cnJl bnRfbW9kZSkKQEAgLTIyNCw3ICsyMjUsNyBAQCBzdGF0aWMgaW50IGVtdWxhdGlvbl9wcm9jX2hh bmRsZXIoc3RydWN0IGN0bF90YWJsZSAqdGFibGUsIGludCB3cml0ZSwKIAkJdXBkYXRlX2luc25f ZW11bGF0aW9uX21vZGUoaW5zbiwgSU5TTl9VTkRFRik7CiAJfQogcmV0OgotCXRhYmxlLT5kYXRh ID0gaW5zbjsKKwltdXRleF91bmxvY2soJmluc25fZW11bGF0aW9uX211dGV4KTsKIAlyZXR1cm4g cmV0OwogfQogCkBAIC0yNTQsNyArMjU1LDcgQEAgc3RhdGljIHZvaWQgX19pbml0IHJlZ2lzdGVy X2luc25fZW11bGF0aW9uX3N5c2N0bChzdHJ1Y3QgY3RsX3RhYmxlICp0YWJsZSkKIAkJc3lzY3Rs LT5tYXhsZW4gPSBzaXplb2YoaW50KTsKIAogCQlzeXNjdGwtPnByb2NuYW1lID0gaW5zbi0+b3Bz LT5uYW1lOwotCQlzeXNjdGwtPmRhdGEgPSBpbnNuOworCQlzeXNjdGwtPmRhdGEgPSAmaW5zbi0+ Y3VycmVudF9tb2RlOwogCQlzeXNjdGwtPmV4dHJhMSA9ICZpbnNuLT5taW47CiAJCXN5c2N0bC0+ ZXh0cmEyID0gJmluc24tPm1heDsKIAkJc3lzY3RsLT5wcm9jX2hhbmRsZXIgPSBlbXVsYXRpb25f cHJvY19oYW5kbGVyOwotLSAKMi4zNS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJt LWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21h aWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=