From patchwork Tue Sep 3 03:30:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: yukaixiong X-Patchwork-Id: 13787962 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B110CA101E for ; Tue, 3 Sep 2024 03:31:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C36BB8D0133; Mon, 2 Sep 2024 23:31:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE7488D0119; Mon, 2 Sep 2024 23:31:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A395F8D0133; Mon, 2 Sep 2024 23:31:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 86F688D0119 for ; Mon, 2 Sep 2024 23:31:39 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4FD531A0218 for ; Tue, 3 Sep 2024 03:31:39 +0000 (UTC) X-FDA: 82522002318.24.4EA9DEB Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf22.hostedemail.com (Postfix) with ESMTP id C823DC0007 for ; Tue, 3 Sep 2024 03:31:36 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725334227; a=rsa-sha256; cv=none; b=uT90mBYB0fwLDBRbDoRPLiskKsEj/91rdSzmGW7Vb1unraDBASNZBgsCQVUPzac22Jo7Ol +xz2zyuyEO+ApjngblZ57LH+DGZIzMbi7qN7y8LCWrBISDVpggZuzvCuorY20ZJtIJA2hm +as/mrD5vpt1GWluZhY9niWSEqZ4ENY= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf22.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725334227; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xvzVUeKHkl6lHJ3cZnWK9VGhkhxSWFwxKFEsY+AhXmA=; b=WskjsEFwZokiln4etj6NN1TBUwJMnLz7b2ndhhqMoBwb5AEY9ph0d2NgkcOVbAj3+B2Xjf HjfSXxtjj70t8y2tZeqmhhEcJMm1o0cIFDq9oYMf8iJ+MJdBwPasuGXTFnpuF4JU/0jMFo I3fd1CzHJbEzxODMUaA4OnpOUqpHKso= Received: from mail.maildlp.com (unknown [172.19.88.163]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4WyWPG2FBqz1S9bC; Tue, 3 Sep 2024 11:31:14 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id 861B9180019; Tue, 3 Sep 2024 11:31:33 +0800 (CST) Received: from huawei.com (10.175.113.32) by kwepemh100016.china.huawei.com (7.202.181.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 3 Sep 2024 11:31:30 +0800 From: Kaixiong Yu To: , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v2 -next 13/15] x86: vdso: move the sysctl into its own file Date: Tue, 3 Sep 2024 11:30:09 +0800 Message-ID: <20240903033011.2870608-14-yukaixiong@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240903033011.2870608-1-yukaixiong@huawei.com> References: <20240903033011.2870608-1-yukaixiong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Queue-Id: C823DC0007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 5ko6tmctz8qnspjx76qcefib673ym7kn X-HE-Tag: 1725334296-53124 X-HE-Meta: U2FsdGVkX19ZU6MLd6N7xC3Ulw8DSdQdWNNvuN6Yl1ogWYacJ6NUL5ISc9JQqlXEe/9nwDd9doYrrbFrDMoUIyl/IUYJ7bWnn1lXK8X+MixmlO3Elw9QV6w+hIofyhmQnfrpDM+z5r4ULWMiJnrcxfSSAjqSFoY6/JA43YWEnLvLIqC8Z2D0ck1Y+iLZ5oGISLVosLVOK1819AiCTGawo/cTlffNq9wZ2bpFz+4s5h1KM6mznZEjy6KrL4857hQa4R/hc/JGc4FT0JJhcvwC65zEeF2FRO+J1eP3tpiPRW2U62TnH8ErEPifRtCxbWr2A64u9nyPTkJx8ZiF5MOU7m4l8ZQlnv/weGnRB0Ga3+O50zQKa3hZZcD7ONI9kcnE5LKai8KR+oQdh5EwVR8U+S0LII9lUHCTxXTeUYv8LSSCvQVzTFtVeTyxljMH7mWOmbMjBGE/GVQQM9zWlGTKo02T6YPiMExMHYPBlGxDfJ99g0v+1FdToYzRx+hRVm9xrMBFz9g5I4glnDLDZ/bmJZ+52ITScwZgfwp+HABs85qkmL2NATY04cha4uAwdIh9z8D0OATZM57BbjEDfOQ7lguOOBg3xTdiOJjiOdPEbguYJKyQbExXkfd99uLCj+8MmQqLGbmxWpIrzS90l9XzhYNHPDINoZAQPOvOqQdtBn/8U74AY0VKeVZfTcnqSY8JUEnFYbE6WNzNDDsmqB1RXXeorA9yU7vWtSKAPZFNe8miww39kgKrt6jEwmvVclYu2omT3qhGFWi7HdnxL5dqrWjgxbJ/tsCsx9bJGG1tZG/l8ChU8AZghtq0/tI8ESyg6szegiAbTrRxdIeuDpGp71nRoXDAX4OyIGq9njCOr5buSgOumOQKRZnkH32xF4UTprDXx5a3vPKHini6YbPMPaBoQ2RYrVcRhJIWWJZuhYZkFOTOegDZz+4Jt7pV3nvwZKU6F/K3dejxvDqGOWc PfPDqncE 2r+IZP5DAsaxHbTvR/bZWWZ0HQeE8BeUT/BlqrzpKBR1oRv445Gm478FO4LrLjCOiD4EBcvCAiRKoP5U8OGxT9fQBE4yp7G1HDBJ063lsTemPrFPaTAjYaZkf2MT+r4jIBcbSE2rSS2wcEHDnOXS8wP/1SethQclt9DKo X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When CONFIG_X86_32 is defined and CONFIG_UML is not defined, vdso_enabled belongs to arch/x86/entry/vdso/vdso32-setup.c. So, move it into its own file. Before this patch, vdso_enabled was allowed to be set to a value exceeding 1 on x86_32 architecture. After this patch is applied, vdso_enabled is not permitted to set the value more than 1. It does not matter, because according to the function load_vdso32(), only vdso_enabled is set to 1, VDSO would be enabled. Other values all mean "disabled". The same limitation could be seen in the function vdso32_setup(). Signed-off-by: Kaixiong Yu Reviewed-by: Kees Cook --- arch/x86/entry/vdso/vdso32-setup.c | 16 +++++++++++----- kernel/sysctl.c | 8 +------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c index 76e4e74f35b5..5a6886a006ab 100644 --- a/arch/x86/entry/vdso/vdso32-setup.c +++ b/arch/x86/entry/vdso/vdso32-setup.c @@ -51,15 +51,17 @@ __setup("vdso32=", vdso32_setup); __setup_param("vdso=", vdso_setup, vdso32_setup, 0); #endif -#ifdef CONFIG_X86_64 #ifdef CONFIG_SYSCTL -/* Register vsyscall32 into the ABI table */ #include -static struct ctl_table abi_table2[] = { +static struct ctl_table vdso_table[] = { { +#ifdef CONFIG_X86_64 .procname = "vsyscall32", +#elif (defined(CONFIG_X86_32) && !defined(CONFIG_UML)) + .procname = "vdso_enabled", +#endif .data = &vdso32_enabled, .maxlen = sizeof(int), .mode = 0644, @@ -71,10 +73,14 @@ static struct ctl_table abi_table2[] = { static __init int ia32_binfmt_init(void) { - register_sysctl("abi", abi_table2); +#ifdef CONFIG_X86_64 + /* Register vsyscall32 into the ABI table */ + register_sysctl("abi", vdso_table); +#elif (defined(CONFIG_X86_32) && !defined(CONFIG_UML)) + register_sysctl_init("vm", vdso_table); +#endif return 0; } __initcall(ia32_binfmt_init); #endif /* CONFIG_SYSCTL */ -#endif /* CONFIG_X86_64 */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6f03fc749794..24617be93119 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2023,17 +2023,11 @@ static struct ctl_table kern_table[] = { }; static struct ctl_table vm_table[] = { -#if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \ - (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) +#if defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL) { .procname = "vdso_enabled", -#ifdef CONFIG_X86_32 - .data = &vdso32_enabled, - .maxlen = sizeof(vdso32_enabled), -#else .data = &vdso_enabled, .maxlen = sizeof(vdso_enabled), -#endif .mode = 0644, .proc_handler = proc_dointvec, .extra1 = SYSCTL_ZERO,