From 4519051d97b7a7b46afc250759e05175db216363 Mon Sep 17 00:00:00 2001
From: Kees Cook <kees.cook@canonical.com>
Date: Thu, 22 Apr 2010 12:19:17 -0700
Subject: [PATCH] --- yaml --- r: 192431 b: refs/heads/master c:
 822cceec7248013821d655545ea45d1c6a9d15b3 h: refs/heads/master i:   192429:
 2c698aec94a85292bbdb61151fbe2f5759841a9b   192427:
 58cd7e7acb230fbd84d60f1c39491b4d959351ea   192423:
 434ffbf96f8887429807f677d90089813dfbf1c2   192415:
 2bcb2a9a5255e45ab29181b07c7b8890aa09e81d v: v3

---
 [refs]                    | 2 +-
 trunk/security/min_addr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c5c1e8da787c..1fec971ff117 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb8dae9607901fd3fc181325ff3f30dce8f574c5
+refs/heads/master: 822cceec7248013821d655545ea45d1c6a9d15b3
diff --git a/trunk/security/min_addr.c b/trunk/security/min_addr.c
index e86f297522bf..f728728f193b 100644
--- a/trunk/security/min_addr.c
+++ b/trunk/security/min_addr.c
@@ -33,7 +33,7 @@ int mmap_min_addr_handler(struct ctl_table *table, int write,
 {
 	int ret;
 
-	if (!capable(CAP_SYS_RAWIO))
+	if (write && !capable(CAP_SYS_RAWIO))
 		return -EPERM;
 
 	ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);