blob: ae69b3e320993f6bfc2a1d2a36998a0d95febfe3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 7dd981b8677ced1703fe26bd97cff4ab3a8dd17e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 13 Feb 2010 03:09:23 -0500
Subject: [PATCH] convert PAGE_SIZE usage
The size of a page may change at runtime or based on kernel settings, so
a static value at compile time doesn't work. More importantly, no one
exports PAGE_SIZE to user space anymore.
URL: http://bugs.gentoo.org/301431
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
include/linux/binfmts.h | 3 ++-
include/linux/resource.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
index c3d6512..b5b71b3 100644
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
@@ -1,6 +1,7 @@
#ifndef _LINUX_BINFMTS_H
#define _LINUX_BINFMTS_H
+#include <unistd.h>
#include <linux/capability.h>
struct pt_regs;
@@ -11,7 +12,7 @@ struct pt_regs;
* prevent the kernel from being unduly impacted by misaddressed pointers.
* MAX_ARG_STRINGS is chosen to fit in a signed 32-bit integer.
*/
-#define MAX_ARG_STRLEN (PAGE_SIZE * 32)
+#define MAX_ARG_STRLEN (sysconf(_SC_PAGESIZE) * 32)
#define MAX_ARG_STRINGS 0x7FFFFFFF
/* sizeof(linux_binprm->buf) */
diff --git a/include/linux/resource.h b/include/linux/resource.h
index d01c96c..5a0559d 100644
--- a/include/linux/resource.h
+++ b/include/linux/resource.h
@@ -68,7 +68,8 @@ struct rlimit64 {
* GPG2 wants 64kB of mlocked memory, to make sure pass phrases
* and other sensitive information are never written to disk.
*/
-#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
+/* No one currently defines PAGE_SIZE bigger than 64kB */
+#define MLOCK_LIMIT (64 * 1024)
/*
* Due to binary compatibility, the actual resource numbers
--
1.7.4.1
|
GitWeb
