[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181011233117.7883-6-rick.p.edgecombe@intel.com>
Date: Thu, 11 Oct 2018 16:31:15 -0700
From: Rick Edgecombe <rick.p.edgecombe@...el.com>
To: kernel-hardening@...ts.openwall.com, daniel@...earbox.net,
keescook@...omium.org, catalin.marinas@....com,
will.deacon@....com, davem@...emloft.net, tglx@...utronix.de,
mingo@...hat.com, bp@...en8.de, x86@...nel.org, arnd@...db.de,
jeyu@...nel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, linux-mips@...ux-mips.org,
linux-s390@...r.kernel.org, sparclinux@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-arch@...r.kernel.org
Cc: kristen@...ux.intel.com, dave.hansen@...el.com,
arjan@...ux.intel.com, deneen.t.dock@...el.com,
Rick Edgecombe <rick.p.edgecombe@...el.com>
Subject: [PATCH v2 5/7] mips/modules: Add rlimit checking for mips modules
This adds in the rlimit checking for the mips module allocator.
This has not been tested.
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@...el.com>
---
arch/mips/kernel/module.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 491605137b03..7a23392512d1 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -47,9 +47,18 @@ static DEFINE_SPINLOCK(dbe_lock);
#ifdef MODULE_START
void *module_alloc(unsigned long size)
{
- return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+ void *p;
+
+ if (check_inc_mod_rlimit(size))
+ return NULL;
+
+ p = __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
__builtin_return_address(0));
+
+ update_mod_rlimit(p, size);
+
+ return p;
}
#endif
--
2.17.1
Powered by blists - more mailing lists