From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 30 Nov 2004 16:43:25 +0000 (+0000)
Subject: - merge revision 1.5
X-Git-Tag: after-CAN_2004_1016_1017_1068-merge~16
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b315c573d92e34ee8d4928be7fda9b31afb0cd94;p=linux-2.6.git

- merge revision 1.5
date: 2004/11/23 15:07:40;  author: mlhuang;  state: Exp;  lines: +4 -4
- apply ioctl() patch to make sure that only superuser or someone
  capable of setting the immutable bit, can set the immulink bit

From: Sam Vilain <sam@vilain.net>
Re: [Vserver] [PATCH] immulink ioctl is not available on vs1.9.3-rc2,  even with CONFIG_VSERVER_LEGACY
To: vserver@list.linux-vserver.org
Date: 10/19/04 12:17 am

Here's the missing link.
---

diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index f6043a6e2..594c16c80 100644
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -50,11 +50,11 @@ int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
 		 *
 		 * This test looks nicer. Thanks to Pauline Middelink
 		 */
-		if ((oldflags & EXT2_IMMUTABLE_FL) ||
+		if (((oldflags & EXT2_IMMUTABLE_FL) ||
 			((flags ^ oldflags) &
-			(EXT2_APPEND_FL | EXT2_IMMUTABLE_FL))) {
-			if (!capable(CAP_LINUX_IMMUTABLE))
-				return -EPERM;
+			 (EXT2_APPEND_FL | EXT2_IMMUTABLE_FL | EXT2_IUNLINK_FL)))
+		    && !capable(CAP_LINUX_IMMUTABLE)) {
+			return -EPERM;		
 		}
 
 		flags = flags & EXT2_FL_USER_MODIFIABLE;