Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / kernel / vserver / limit.c

diff --git a/kernel/vserver/limit.c b/kernel/vserver/limit.c
index c97d57f..c47f54c 100644 (file)
--- a/kernel/vserver/limit.c
+++ b/kernel/vserver/limit.c
@@ -3,10 +3,9 @@
  *
  *  Virtual Server: Context Limits
  *
- *  Copyright (C) 2004-2006  Herbert Pötzl
+ *  Copyright (C) 2004-2005  Herbert Pötzl
  *
  *  V0.01  broken out from vcontext V0.05
- *  V0.02  sync to valid limit check from 2.1.1
  *
  */
 
@@ -41,33 +40,25 @@ const char *vlimit_name[NUM_LIMITS] = {
 EXPORT_SYMBOL_GPL(vlimit_name);
 
 
-#define MASK_ENTRY(x)  (1 << (x))
-
-const struct vcmd_ctx_rlimit_mask_v0 vlimit_mask = {
-               /* minimum */
-       0
-       ,       /* softlimit */
-       0
-       ,       /* maximum */
-       MASK_ENTRY( RLIMIT_RSS          ) |
-       MASK_ENTRY( RLIMIT_NPROC        ) |
-       MASK_ENTRY( RLIMIT_NOFILE       ) |
-       MASK_ENTRY( RLIMIT_MEMLOCK      ) |
-       MASK_ENTRY( RLIMIT_AS           ) |
-       MASK_ENTRY( RLIMIT_LOCKS        ) |
-       MASK_ENTRY( RLIMIT_MSGQUEUE     ) |
-
-       MASK_ENTRY( VLIMIT_ANON         ) |
-       MASK_ENTRY( VLIMIT_SHMEM        ) |
-       0
-};
-
-
-static int is_valid_vlimit(int id)
+static int is_valid_rlimit(int id)
 {
-       uint32_t mask = vlimit_mask.minimum |
-               vlimit_mask.softlimit | vlimit_mask.maximum;
-       return mask & (1 << id);
+       int valid = 0;
+
+       switch (id) {
+       case RLIMIT_RSS:
+       case RLIMIT_NPROC:
+       case RLIMIT_NOFILE:
+       case RLIMIT_MEMLOCK:
+       case RLIMIT_AS:
+
+       case VLIMIT_NSOCK:
+       case VLIMIT_OPENFD:
+       case VLIMIT_ANON:
+       case VLIMIT_SHMEM:
+               valid = 1;
+               break;
+       }
+       return valid;
 }
 
 static inline uint64_t vc_get_rlim(struct vx_info *vxi, int id)
@@ -85,7 +76,7 @@ static int do_get_rlimit(xid_t xid, uint32_t id,
 {
        struct vx_info *vxi;
 
-       if (!is_valid_vlimit(id))
+       if (!is_valid_rlimit(id))
                return -EINVAL;
 
        vxi = lookup_vx_info(xid);
@@ -125,7 +116,7 @@ static int do_set_rlimit(xid_t xid, uint32_t id,
 {
        struct vx_info *vxi;
 
-       if (!is_valid_vlimit(id))
+       if (!is_valid_rlimit(id))
                return -EINVAL;
 
        vxi = lookup_vx_info(xid);
@@ -190,7 +181,25 @@ int vc_get_rlimit_x32(uint32_t id, void __user *data)
 
 int vc_get_rlimit_mask(uint32_t id, void __user *data)
 {
-       if (copy_to_user(data, &vlimit_mask, sizeof(vlimit_mask)))
+       static struct vcmd_ctx_rlimit_mask_v0 mask = {
+                       /* minimum */
+               0
+               ,       /* softlimit */
+               0
+               ,       /* maximum */
+               (1 << RLIMIT_RSS) |
+               (1 << RLIMIT_NPROC) |
+               (1 << RLIMIT_NOFILE) |
+               (1 << RLIMIT_MEMLOCK) |
+               (1 << RLIMIT_LOCKS) |
+               (1 << RLIMIT_AS) |
+               (1 << VLIMIT_ANON) |
+               0
+               };
+
+       if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RESOURCE))
+               return -EPERM;
+       if (copy_to_user(data, &mask, sizeof(mask)))
                return -EFAULT;
        return 0;
 }