From fb10d36d7cd4159be19a016402a738b657fe661d Mon Sep 17 00:00:00 2001
From: Kees Cook <kees.cook@canonical.com>
Date: Sun, 8 Nov 2009 09:37:00 -0800
Subject: [PATCH] --- yaml --- r: 169166 b: refs/heads/master c:
 0e1a6ef2dea88101b056b6d9984f3325c5efced3 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/security/min_addr.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index edebb2a38550..bc8d32c534e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31bde71c202722a76686c3cf69a254c8a912275a
+refs/heads/master: 0e1a6ef2dea88101b056b6d9984f3325c5efced3
diff --git a/trunk/security/min_addr.c b/trunk/security/min_addr.c
index c844eed7915d..fc43c9d37084 100644
--- a/trunk/security/min_addr.c
+++ b/trunk/security/min_addr.c
@@ -33,6 +33,9 @@ int mmap_min_addr_handler(struct ctl_table *table, int write,
 {
 	int ret;
 
+	if (!capable(CAP_SYS_RAWIO))
+		return -EPERM;
+
 	ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
 
 	update_mmap_min_addr();