KEYS: Add garbage collection for dead, revoked and expired keys. [try #6]

[pandora-kernel.git] / security / keys / sysctl.c

diff --git a/security/keys/sysctl.c b/security/keys/sysctl.c
index b611d49..5e05dc0 100644 (file)
--- a/security/keys/sysctl.c
+++ b/security/keys/sysctl.c
@@ -13,6 +13,8 @@
 #include <linux/sysctl.h>
 #include "internal.h"
 
+static const int zero, one = 1, max = INT_MAX;
+
 ctl_table key_sysctls[] = {
        {
                .ctl_name = CTL_UNNUMBERED,
@@ -20,7 +22,9 @@ ctl_table key_sysctls[] = {
                .data = &key_quota_maxkeys,
                .maxlen = sizeof(unsigned),
                .mode = 0644,
-               .proc_handler = &proc_dointvec,
+               .proc_handler = &proc_dointvec_minmax,
+               .extra1 = (void *) &one,
+               .extra2 = (void *) &max,
        },
        {
                .ctl_name = CTL_UNNUMBERED,
@@ -28,7 +32,9 @@ ctl_table key_sysctls[] = {
                .data = &key_quota_maxbytes,
                .maxlen = sizeof(unsigned),
                .mode = 0644,
-               .proc_handler = &proc_dointvec,
+               .proc_handler = &proc_dointvec_minmax,
+               .extra1 = (void *) &one,
+               .extra2 = (void *) &max,
        },
        {
                .ctl_name = CTL_UNNUMBERED,
@@ -36,7 +42,9 @@ ctl_table key_sysctls[] = {
                .data = &key_quota_root_maxkeys,
                .maxlen = sizeof(unsigned),
                .mode = 0644,
-               .proc_handler = &proc_dointvec,
+               .proc_handler = &proc_dointvec_minmax,
+               .extra1 = (void *) &one,
+               .extra2 = (void *) &max,
        },
        {
                .ctl_name = CTL_UNNUMBERED,
@@ -44,7 +52,19 @@ ctl_table key_sysctls[] = {
                .data = &key_quota_root_maxbytes,
                .maxlen = sizeof(unsigned),
                .mode = 0644,
-               .proc_handler = &proc_dointvec,
+               .proc_handler = &proc_dointvec_minmax,
+               .extra1 = (void *) &one,
+               .extra2 = (void *) &max,
+       },
+       {
+               .ctl_name = CTL_UNNUMBERED,
+               .procname = "gc_delay",
+               .data = &key_gc_delay,
+               .maxlen = sizeof(unsigned),
+               .mode = 0644,
+               .proc_handler = &proc_dointvec_minmax,
+               .extra1 = (void *) &zero,
+               .extra2 = (void *) &max,
        },
        { .ctl_name = 0 }
 };