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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA081E7718F for ; Sat, 28 Dec 2024 15:02:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3EA596B0099; Sat, 28 Dec 2024 10:02:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 325596B009B; Sat, 28 Dec 2024 10:02:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 128AC6B009C; Sat, 28 Dec 2024 10:02:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E16706B0099 for ; Sat, 28 Dec 2024 10:02:12 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id A59391A17D6 for ; Sat, 28 Dec 2024 15:02:12 +0000 (UTC) X-FDA: 82944681624.07.9E0157E Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf28.hostedemail.com (Postfix) with ESMTP id 55ED1C000A for ; Sat, 28 Dec 2024 15:01:21 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735398110; 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=JmVbJ1u7I/fiM/mZTKbXVhm296hUyc9nVwr6w+TBxSU=; b=Sotygsy5o35Q0c4y8XI0SWKQD3yqqsgoQo75+M4884KIPV3q7KcCAx9V1+bxRwHMBHFq3I yyQoqOc4cE7JgFUc8v6shGbarPMdAsYMgzWXjnxYZnbV6YapfQ6SYOYoIWC8pUX1YOdxiY WVaAW8XBhA9p399vVkbPiazLJ7OPAq4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735398110; a=rsa-sha256; cv=none; b=Hy+MNBYefqAD33Xrm2wkzqmq2CigNm5R75TsfxYoImE30Z+pyzDwfa0p7aMJuw+U1yZacM sw7j3AAFDCwX3Y0ThNVDMJO1vd6WI0Dikdmd4hd49VddDXkdd2XdAGbCXvu1u5unQRj9fr zCms5bm7hZpdzedJoTXFRDuW/iAvaac= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4YL59f4bVdz1kxHQ; Sat, 28 Dec 2024 22:59:18 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id 1665B1A0188; Sat, 28 Dec 2024 23:02:06 +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; Sat, 28 Dec 2024 23:02:02 +0800 From: Kaixiong Yu To: , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v4 -next 07/15] security: min_addr: move sysctl to security/min_addr.c Date: Sat, 28 Dec 2024 22:57:38 +0800 Message-ID: <20241228145746.2783627-8-yukaixiong@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241228145746.2783627-1-yukaixiong@huawei.com> References: <20241228145746.2783627-1-yukaixiong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 55ED1C000A X-Stat-Signature: b9i4y56k3jogw16wg1y5d3yhy8oxps3i X-Rspam-User: X-HE-Tag: 1735398081-359528 X-HE-Meta: U2FsdGVkX188AgAfydfzBZjBRA7eMAKQUD75r/nAo8ahkKBcjASohBFW/pvZrTeV4wdplIL0gWhmXhCCwcY56Tq7B5+HKkYCTqGlHubD5hZEkLtGsy0WyvMkdUBuLrqVxJ3GUdMAIwyFKGa8mr9McVJ3IcuUnYMPfSTqEZhrq7JV/4yavcMtXhhNPk7NA46Bm7mhWt6HLozZ04fAJIo1Rg++FucSS08hEp2+J2D9RlxLkHOKQte3ltl13fGqTHMWkwwtS4HYIYj/Suw339o2Zd2tiCJwqgI2GsEqzGpl31KbNgCeYdY8xXK70QYIfvwVSxQEeNXeQ/A0pGneVCZwSPEuXg0MuzKt9e41i41H8obK6y7MO/Mr8Si/jM6If+MqTsDqDrm4IjqfXgMD+DCy65efSpzVoRTcOgDl55lMk6dcQSL8rv5Ft3qLTFI/yAUh6+e3C3CrrhrslxR3uOuq0/HXPYPZ0noavfTMay/fuxEYTn50Nd0oLU3q4nTB622OqHRzI5+bEpmZ2JvSVffitZMsvC7VBiQ9mpBG72kNGLuIpfUHlYDsSxpK9lbph+205D+Yb4DPn5gHVtcoe8ccsGLiAqsjarZVAnkImOdDtRqIIh7ejEQjqMYqEo68YJ35a+0+FGf74iMzi/jSQadjdZsCPxL79H/f56Dt3ham5GPLM+4rhTzfyJ+0u1lym4Y2CiSYiWsHVN1qeJm/k4PzCu34n1DlacySVWctAopUHUeTqmeXBvJXL5cjjI3++PaCjJyIzxZTFKi6zEdc42plRF8ruz52oRWq3PsyS+Dvxui6aWW0Wg/jZPUFHYQmzD1l/2cUvalL+tdFj5tKhUuGPJ1UlqzZ0TlT2FnRtWQFbszQS8FzHI1RcloqTLAAgDCBIvfcP+3vkYSPDo8Qz8xkd9N8p9EQey0tNQ9mFZZgjRbsh0W790WrUoCvVa3PzlYTU9n0e2EGy6tl1hbDg9T mPgCf9RD 3/k7yUVF90nExhgXTZlZQkj/fzbDlpNqQ8wr6qQOcFBpgcYp587BOYKp+eOMZ2La8wqddqmr62OWw/ZgwjrYwQastgxAGQh6DxbDPpACwVg5JzD4wBbdvk4q8v2j4npLUdvhdL4h0lOWjPPSkDERbmLK6NsqXwpgNyhFVGGIuEoi7JeURukt3oFFRiP4BUr8E8ukYynzcDa6ahUPUiNe64ZxQxmO9T2+NaFbR5DcwXwg9xXjTV75yYNYwtNCyasACAg02hC1hZEscAbPnmxWULdbglD8lgDdhnWg9TBRzEFesK7RL1xFPFuwFw5PHxYcWZtyI0yeh8ZxB+O+QtNqhqCPRxe/aQMvnSBO3mk8FjwbBan7jL1rIFNkTrGwyfO1RH7mnIPqZh4X3pYv/UUpkTRVKpnqPvOoXlvQTLIWbA/GIWYg= 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: The dac_mmap_min_addr belongs to min_addr.c, move it to min_addr.c from /kernel/sysctl.c. In the previous Linux kernel boot process, sysctl_init_bases needs to be executed before init_mmap_min_addr, So, register_sysctl_init should be executed before update_mmap_min_addr in init_mmap_min_addr. And according to the compilation condition in security/Makefile: obj-$(CONFIG_MMU) += min_addr.o if CONFIG_MMU is not defined, min_addr.c would not be included in the compilation process. So, drop the CONFIG_MMU check. Signed-off-by: Kaixiong Yu Reviewed-by: Kees Cook Acked-by: Paul Moore --- v4: - const qualify struct ctl_table min_addr_sysctl_table v3: - change the title v2: - update the changelog to explain why drop CONFIG_MMU check. --- --- kernel/sysctl.c | 9 --------- security/min_addr.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9c245898f535..62a58e417c40 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2049,15 +2049,6 @@ static struct ctl_table vm_table[] = { .proc_handler = proc_dointvec_minmax, .extra1 = SYSCTL_ZERO, }, -#ifdef CONFIG_MMU - { - .procname = "mmap_min_addr", - .data = &dac_mmap_min_addr, - .maxlen = sizeof(unsigned long), - .mode = 0644, - .proc_handler = mmap_min_addr_handler, - }, -#endif #if (defined(CONFIG_X86_32) && !defined(CONFIG_UML))|| \ (defined(CONFIG_SUPERH) && defined(CONFIG_VSYSCALL)) { diff --git a/security/min_addr.c b/security/min_addr.c index 0ce267c041ab..df1bc643d886 100644 --- a/security/min_addr.c +++ b/security/min_addr.c @@ -44,8 +44,19 @@ int mmap_min_addr_handler(const struct ctl_table *table, int write, return ret; } +static const struct ctl_table min_addr_sysctl_table[] = { + { + .procname = "mmap_min_addr", + .data = &dac_mmap_min_addr, + .maxlen = sizeof(unsigned long), + .mode = 0644, + .proc_handler = mmap_min_addr_handler, + }, +}; + static int __init init_mmap_min_addr(void) { + register_sysctl_init("vm", min_addr_sysctl_table); update_mmap_min_addr(); return 0; -- 2.34.1