From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 7 Jun 2005 18:09:06 +0000 (+0000)
Subject: - fix 2.6.10 merge regression
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~201
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=97c5624deedfaff5037b5536ec5764a927ebc85f;p=linux-2.6.git

- fix 2.6.10 merge regression
- PL3131 fix: prevent vservers from escaping chroot() barriers
---

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 97fbb8619..9c676901a 100644
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -215,6 +215,10 @@ posix_acl_permission(struct inode *inode, const struct posix_acl *acl, int want)
 	const struct posix_acl_entry *pa, *pe, *mask_obj;
 	int found = 0;
 
+	/* Prevent vservers from escaping chroot() barriers */
+	if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN))
+		return -EACCES;
+
 	FOREACH_ACL_ENTRY(pa, acl, pe) {
                 switch(pa->e_tag) {
                         case ACL_USER_OBJ: