From bddba6014241e7bd4bba91e40b2707202d17fd50 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sat, 3 Mar 2012 19:52:01 -0800
Subject: [PATCH] --- yaml --- r: 306005 b: refs/heads/master c:
 52137abe1820196d956bfd51edebc571b3427deb h: refs/heads/master i:   306003:
 39fb951e54729aa22c0966af1096981c33d1160d v: v3

---
 [refs]          |  2 +-
 trunk/fs/open.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cce118796a9d..3f5a12528091 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e96e3b7b8407be794ab1fd8e4b332818a358e78
+refs/heads/master: 52137abe1820196d956bfd51edebc571b3427deb
diff --git a/trunk/fs/open.c b/trunk/fs/open.c
index 92335f663545..e16680138323 100644
--- a/trunk/fs/open.c
+++ b/trunk/fs/open.c
@@ -506,15 +506,24 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
 	struct inode *inode = path->dentry->d_inode;
 	int error;
 	struct iattr newattrs;
+	kuid_t uid;
+	kgid_t gid;
+
+	uid = make_kuid(current_user_ns(), user);
+	gid = make_kgid(current_user_ns(), group);
 
 	newattrs.ia_valid =  ATTR_CTIME;
 	if (user != (uid_t) -1) {
+		if (!uid_valid(uid))
+			return -EINVAL;
 		newattrs.ia_valid |= ATTR_UID;
-		newattrs.ia_uid = user;
+		newattrs.ia_uid = uid;
 	}
 	if (group != (gid_t) -1) {
+		if (!gid_valid(gid))
+			return -EINVAL;
 		newattrs.ia_valid |= ATTR_GID;
-		newattrs.ia_gid = group;
+		newattrs.ia_gid = gid;
 	}
 	if (!S_ISDIR(inode->i_mode))
 		newattrs.ia_valid |=