fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / sctp / sysctl.c

diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
index dc6f3ff..633cd17 100644 (file)
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
@@ -45,9 +45,10 @@
 #include <net/sctp/sctp.h>
 #include <linux/sysctl.h>
 
-static ctl_handler sctp_sysctl_jiffies_ms;
-static long rto_timer_min = 1;
-static long rto_timer_max = 86400000; /* One day */
+static int zero = 0;
+static int one = 1;
+static int timer_max = 86400000; /* ms in one day */
+static int int_max = INT_MAX;
 static long sack_timer_min = 1;
 static long sack_timer_max = 500;
 
@@ -56,45 +57,45 @@ static ctl_table sctp_table[] = {
                .ctl_name       = NET_SCTP_RTO_INITIAL,
                .procname       = "rto_initial",
                .data           = &sctp_rto_initial,
-               .maxlen         = sizeof(long),
+               .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
-               .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
-               .strategy       = &sctp_sysctl_jiffies_ms,
-               .extra1         = &rto_timer_min,
-               .extra2         = &rto_timer_max
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &timer_max
        },
        {
                .ctl_name       = NET_SCTP_RTO_MIN,
                .procname       = "rto_min",
                .data           = &sctp_rto_min,
-               .maxlen         = sizeof(long),
+               .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
-               .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
-               .strategy       = &sctp_sysctl_jiffies_ms,
-               .extra1         = &rto_timer_min,
-               .extra2         = &rto_timer_max
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &timer_max
        },
        {
                .ctl_name       = NET_SCTP_RTO_MAX,
                .procname       = "rto_max",
                .data           = &sctp_rto_max,
-               .maxlen         = sizeof(long),
+               .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
-               .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
-               .strategy       = &sctp_sysctl_jiffies_ms,
-               .extra1         = &rto_timer_min,
-               .extra2         = &rto_timer_max
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &timer_max
        },
        {
                .ctl_name       = NET_SCTP_VALID_COOKIE_LIFE,
                .procname       = "valid_cookie_life",
                .data           = &sctp_valid_cookie_life,
-               .maxlen         = sizeof(long),
+               .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
-               .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
-               .strategy       = &sctp_sysctl_jiffies_ms,
-               .extra1         = &rto_timer_min,
-               .extra2         = &rto_timer_max
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &timer_max
        },
        {
                .ctl_name       = NET_SCTP_MAX_BURST,
@@ -102,7 +103,10 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_max_burst,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &zero,
+               .extra2         = &int_max
        },
        {
                .ctl_name       = NET_SCTP_ASSOCIATION_MAX_RETRANS,
@@ -110,7 +114,10 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_max_retrans_association,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &int_max
        },
        {
                .ctl_name       = NET_SCTP_SNDBUF_POLICY,
@@ -118,7 +125,8 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_sndbuf_policy,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_RCVBUF_POLICY,
@@ -126,7 +134,8 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_rcvbuf_policy,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_PATH_MAX_RETRANS,
@@ -134,7 +143,10 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_max_retrans_path,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &int_max
        },
        {
                .ctl_name       = NET_SCTP_MAX_INIT_RETRANSMITS,
@@ -142,18 +154,21 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_max_retrans_init,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &int_max
        },
        {
                .ctl_name       = NET_SCTP_HB_INTERVAL,
                .procname       = "hb_interval",
                .data           = &sctp_hb_interval,
-               .maxlen         = sizeof(long),
+               .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
-               .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
-               .strategy       = &sctp_sysctl_jiffies_ms,
-               .extra1         = &rto_timer_min,
-               .extra2         = &rto_timer_max
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &one,
+               .extra2         = &timer_max
        },
        {
                .ctl_name       = NET_SCTP_PRESERVE_ENABLE,
@@ -161,23 +176,26 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_cookie_preserve_enable,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_RTO_ALPHA,
                .procname       = "rto_alpha_exp_divisor",
                .data           = &sctp_rto_alpha,
                .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_RTO_BETA,
                .procname       = "rto_beta_exp_divisor",
                .data           = &sctp_rto_beta,
                .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .mode           = 0444,
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_ADDIP_ENABLE,
@@ -185,7 +203,8 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_addip_enable,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_PRSCTP_ENABLE,
@@ -193,7 +212,8 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_prsctp_enable,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = &proc_dointvec,
+               .strategy       = &sysctl_intvec
        },
        {
                .ctl_name       = NET_SCTP_SACK_TIMEOUT,
@@ -201,8 +221,8 @@ static ctl_table sctp_table[] = {
                .data           = &sctp_sack_timeout,
                .maxlen         = sizeof(long),
                .mode           = 0644,
-               .proc_handler   = &proc_doulongvec_ms_jiffies_minmax,
-               .strategy       = &sctp_sysctl_jiffies_ms,
+               .proc_handler   = &proc_dointvec_minmax,
+               .strategy       = &sysctl_intvec,
                .extra1         = &sack_timer_min,
                .extra2         = &sack_timer_max,
        },
@@ -242,37 +262,3 @@ void sctp_sysctl_unregister(void)
 {
        unregister_sysctl_table(sctp_sysctl_header);
 }
-
-/* Strategy function to convert jiffies to milliseconds.  */
-static int sctp_sysctl_jiffies_ms(ctl_table *table, int __user *name, int nlen,
-               void __user *oldval, size_t __user *oldlenp,
-               void __user *newval, size_t newlen, void **context) {
-
-       if (oldval) {
-               size_t olen;
-
-               if (oldlenp) {
-                       if (get_user(olen, oldlenp))
-                               return -EFAULT;
-
-                       if (olen != sizeof (int))
-                               return -EINVAL;
-               }
-               if (put_user((*(int *)(table->data) * 1000) / HZ,
-                       (int __user *)oldval) ||
-                   (oldlenp && put_user(sizeof (int), oldlenp)))
-                       return -EFAULT;
-       }
-       if (newval && newlen) {
-               int new;
-
-               if (newlen != sizeof (int))
-                       return -EINVAL;
-
-               if (get_user(new, (int __user *)newval))
-                       return -EFAULT;
-
-               *(int *)(table->data) = (new * HZ) / 1000;
-       }
-       return 1;
-}