aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c579
1 files changed, 415 insertions, 164 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 8686b0f5fc12..b12583047757 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -163,6 +163,27 @@ static int proc_taint(struct ctl_table *table, int write,
163 void __user *buffer, size_t *lenp, loff_t *ppos); 163 void __user *buffer, size_t *lenp, loff_t *ppos);
164#endif 164#endif
165 165
166#ifdef CONFIG_MAGIC_SYSRQ
167static int __sysrq_enabled; /* Note: sysrq code ises it's own private copy */
168
169static int sysrq_sysctl_handler(ctl_table *table, int write,
170 void __user *buffer, size_t *lenp,
171 loff_t *ppos)
172{
173 int error;
174
175 error = proc_dointvec(table, write, buffer, lenp, ppos);
176 if (error)
177 return error;
178
179 if (write)
180 sysrq_toggle_support(__sysrq_enabled);
181
182 return 0;
183}
184
185#endif
186
166static struct ctl_table root_table[]; 187static struct ctl_table root_table[];
167static struct ctl_table_root sysctl_table_root; 188static struct ctl_table_root sysctl_table_root;
168static struct ctl_table_header root_table_header = { 189static struct ctl_table_header root_table_header = {
@@ -567,7 +588,7 @@ static struct ctl_table kern_table[] = {
567 .data = &__sysrq_enabled, 588 .data = &__sysrq_enabled,
568 .maxlen = sizeof (int), 589 .maxlen = sizeof (int),
569 .mode = 0644, 590 .mode = 0644,
570 .proc_handler = proc_dointvec, 591 .proc_handler = sysrq_sysctl_handler,
571 }, 592 },
572#endif 593#endif
573#ifdef CONFIG_PROC_SYSCTL 594#ifdef CONFIG_PROC_SYSCTL
@@ -621,7 +642,7 @@ static struct ctl_table kern_table[] = {
621#endif 642#endif
622 { 643 {
623 .procname = "userprocess_debug", 644 .procname = "userprocess_debug",
624 .data = &sysctl_userprocess_debug, 645 .data = &show_unhandled_signals,
625 .maxlen = sizeof(int), 646 .maxlen = sizeof(int),
626 .mode = 0644, 647 .mode = 0644,
627 .proc_handler = proc_dointvec, 648 .proc_handler = proc_dointvec,
@@ -1431,7 +1452,8 @@ static struct ctl_table fs_table[] = {
1431}; 1452};
1432 1453
1433static struct ctl_table debug_table[] = { 1454static struct ctl_table debug_table[] = {
1434#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) 1455#if defined(CONFIG_X86) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) || \
1456 defined(CONFIG_S390)
1435 { 1457 {
1436 .procname = "exception-trace", 1458 .procname = "exception-trace",
1437 .data = &show_unhandled_signals, 1459 .data = &show_unhandled_signals,
@@ -2040,8 +2062,132 @@ int proc_dostring(struct ctl_table *table, int write,
2040 buffer, lenp, ppos); 2062 buffer, lenp, ppos);
2041} 2063}
2042 2064
2065static size_t proc_skip_spaces(char **buf)
2066{
2067 size_t ret;
2068 char *tmp = skip_spaces(*buf);
2069 ret = tmp - *buf;
2070 *buf = tmp;
2071 return ret;
2072}
2073
2074static void proc_skip_char(char **buf, size_t *size, const char v)
2075{
2076 while (*size) {
2077 if (**buf != v)
2078 break;
2079 (*size)--;
2080 (*buf)++;
2081 }
2082}
2083
2084#define TMPBUFLEN 22
2085/**
2086 * proc_get_long - reads an ASCII formated integer from a user buffer
2087 *
2088 * @buf - a kernel buffer
2089 * @size - size of the kernel buffer
2090 * @val - this is where the number will be stored
2091 * @neg - set to %TRUE if number is negative
2092 * @perm_tr - a vector which contains the allowed trailers
2093 * @perm_tr_len - size of the perm_tr vector
2094 * @tr - pointer to store the trailer character
2095 *
2096 * In case of success 0 is returned and buf and size are updated with
2097 * the amount of bytes read. If tr is non NULL and a trailing
2098 * character exist (size is non zero after returning from this
2099 * function) tr is updated with the trailing character.
2100 */
2101static int proc_get_long(char **buf, size_t *size,
2102 unsigned long *val, bool *neg,
2103 const char *perm_tr, unsigned perm_tr_len, char *tr)
2104{
2105 int len;
2106 char *p, tmp[TMPBUFLEN];
2107
2108 if (!*size)
2109 return -EINVAL;
2110
2111 len = *size;
2112 if (len > TMPBUFLEN - 1)
2113 len = TMPBUFLEN - 1;
2114
2115 memcpy(tmp, *buf, len);
2116
2117 tmp[len] = 0;
2118 p = tmp;
2119 if (*p == '-' && *size > 1) {
2120 *neg = true;
2121 p++;
2122 } else
2123 *neg = false;
2124 if (!isdigit(*p))
2125 return -EINVAL;
2126
2127 *val = simple_strtoul(p, &p, 0);
2128
2129 len = p - tmp;
2130
2131 /* We don't know if the next char is whitespace thus we may accept
2132 * invalid integers (e.g. 1234...a) or two integers instead of one
2133 * (e.g. 123...1). So lets not allow such large numbers. */
2134 if (len == TMPBUFLEN - 1)
2135 return -EINVAL;
2136
2137 if (len < *size && perm_tr_len && !memchr(perm_tr, *p, perm_tr_len))
2138 return -EINVAL;
2139
2140 if (tr && (len < *size))
2141 *tr = *p;
2142
2143 *buf += len;
2144 *size -= len;
2145
2146 return 0;
2147}
2148
2149/**
2150 * proc_put_long - coverts an integer to a decimal ASCII formated string
2151 *
2152 * @buf - the user buffer
2153 * @size - the size of the user buffer
2154 * @val - the integer to be converted
2155 * @neg - sign of the number, %TRUE for negative
2156 *
2157 * In case of success 0 is returned and buf and size are updated with
2158 * the amount of bytes read.
2159 */
2160static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
2161 bool neg)
2162{
2163 int len;
2164 char tmp[TMPBUFLEN], *p = tmp;
2165
2166 sprintf(p, "%s%lu", neg ? "-" : "", val);
2167 len = strlen(tmp);
2168 if (len > *size)
2169 len = *size;
2170 if (copy_to_user(*buf, tmp, len))
2171 return -EFAULT;
2172 *size -= len;
2173 *buf += len;
2174 return 0;
2175}
2176#undef TMPBUFLEN
2043 2177
2044static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp, 2178static int proc_put_char(void __user **buf, size_t *size, char c)
2179{
2180 if (*size) {
2181 char __user **buffer = (char __user **)buf;
2182 if (put_user(c, *buffer))
2183 return -EFAULT;
2184 (*size)--, (*buffer)++;
2185 *buf = *buffer;
2186 }
2187 return 0;
2188}
2189
2190static int do_proc_dointvec_conv(bool *negp, unsigned long *lvalp,
2045 int *valp, 2191 int *valp,
2046 int write, void *data) 2192 int write, void *data)
2047{ 2193{
@@ -2050,33 +2196,31 @@ static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
2050 } else { 2196 } else {
2051 int val = *valp; 2197 int val = *valp;
2052 if (val < 0) { 2198 if (val < 0) {
2053 *negp = -1; 2199 *negp = true;
2054 *lvalp = (unsigned long)-val; 2200 *lvalp = (unsigned long)-val;
2055 } else { 2201 } else {
2056 *negp = 0; 2202 *negp = false;
2057 *lvalp = (unsigned long)val; 2203 *lvalp = (unsigned long)val;
2058 } 2204 }
2059 } 2205 }
2060 return 0; 2206 return 0;
2061} 2207}
2062 2208
2209static const char proc_wspace_sep[] = { ' ', '\t', '\n' };
2210
2063static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, 2211static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
2064 int write, void __user *buffer, 2212 int write, void __user *buffer,
2065 size_t *lenp, loff_t *ppos, 2213 size_t *lenp, loff_t *ppos,
2066 int (*conv)(int *negp, unsigned long *lvalp, int *valp, 2214 int (*conv)(bool *negp, unsigned long *lvalp, int *valp,
2067 int write, void *data), 2215 int write, void *data),
2068 void *data) 2216 void *data)
2069{ 2217{
2070#define TMPBUFLEN 21 2218 int *i, vleft, first = 1, err = 0;
2071 int *i, vleft, first = 1, neg; 2219 unsigned long page = 0;
2072 unsigned long lval; 2220 size_t left;
2073 size_t left, len; 2221 char *kbuf;
2074 2222
2075 char buf[TMPBUFLEN], *p; 2223 if (!tbl_data || !table->maxlen || !*lenp || (*ppos && !write)) {
2076 char __user *s = buffer;
2077
2078 if (!tbl_data || !table->maxlen || !*lenp ||
2079 (*ppos && !write)) {
2080 *lenp = 0; 2224 *lenp = 0;
2081 return 0; 2225 return 0;
2082 } 2226 }
@@ -2088,89 +2232,69 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
2088 if (!conv) 2232 if (!conv)
2089 conv = do_proc_dointvec_conv; 2233 conv = do_proc_dointvec_conv;
2090 2234
2235 if (write) {
2236 if (left > PAGE_SIZE - 1)
2237 left = PAGE_SIZE - 1;
2238 page = __get_free_page(GFP_TEMPORARY);
2239 kbuf = (char *) page;
2240 if (!kbuf)
2241 return -ENOMEM;
2242 if (copy_from_user(kbuf, buffer, left)) {
2243 err = -EFAULT;
2244 goto free;
2245 }
2246 kbuf[left] = 0;
2247 }
2248
2091 for (; left && vleft--; i++, first=0) { 2249 for (; left && vleft--; i++, first=0) {
2092 if (write) { 2250 unsigned long lval;
2093 while (left) { 2251 bool neg;
2094 char c;
2095 if (get_user(c, s))
2096 return -EFAULT;
2097 if (!isspace(c))
2098 break;
2099 left--;
2100 s++;
2101 }
2102 if (!left)
2103 break;
2104 neg = 0;
2105 len = left;
2106 if (len > sizeof(buf) - 1)
2107 len = sizeof(buf) - 1;
2108 if (copy_from_user(buf, s, len))
2109 return -EFAULT;
2110 buf[len] = 0;
2111 p = buf;
2112 if (*p == '-' && left > 1) {
2113 neg = 1;
2114 p++;
2115 }
2116 if (*p < '0' || *p > '9')
2117 break;
2118 2252
2119 lval = simple_strtoul(p, &p, 0); 2253 if (write) {
2254 left -= proc_skip_spaces(&kbuf);
2120 2255
2121 len = p-buf; 2256 err = proc_get_long(&kbuf, &left, &lval, &neg,
2122 if ((len < left) && *p && !isspace(*p)) 2257 proc_wspace_sep,
2258 sizeof(proc_wspace_sep), NULL);
2259 if (err)
2123 break; 2260 break;
2124 s += len; 2261 if (conv(&neg, &lval, i, 1, data)) {
2125 left -= len; 2262 err = -EINVAL;
2126
2127 if (conv(&neg, &lval, i, 1, data))
2128 break; 2263 break;
2264 }
2129 } else { 2265 } else {
2130 p = buf; 2266 if (conv(&neg, &lval, i, 0, data)) {
2267 err = -EINVAL;
2268 break;
2269 }
2131 if (!first) 2270 if (!first)
2132 *p++ = '\t'; 2271 err = proc_put_char(&buffer, &left, '\t');
2133 2272 if (err)
2134 if (conv(&neg, &lval, i, 0, data)) 2273 break;
2274 err = proc_put_long(&buffer, &left, lval, neg);
2275 if (err)
2135 break; 2276 break;
2136
2137 sprintf(p, "%s%lu", neg ? "-" : "", lval);
2138 len = strlen(buf);
2139 if (len > left)
2140 len = left;
2141 if(copy_to_user(s, buf, len))
2142 return -EFAULT;
2143 left -= len;
2144 s += len;
2145 } 2277 }
2146 } 2278 }
2147 2279
2148 if (!write && !first && left) { 2280 if (!write && !first && left && !err)
2149 if(put_user('\n', s)) 2281 err = proc_put_char(&buffer, &left, '\n');
2150 return -EFAULT; 2282 if (write && !err)
2151 left--, s++; 2283 left -= proc_skip_spaces(&kbuf);
2152 } 2284free:
2153 if (write) { 2285 if (write) {
2154 while (left) { 2286 free_page(page);
2155 char c; 2287 if (first)
2156 if (get_user(c, s++)) 2288 return err ? : -EINVAL;
2157 return -EFAULT;
2158 if (!isspace(c))
2159 break;
2160 left--;
2161 }
2162 } 2289 }
2163 if (write && first)
2164 return -EINVAL;
2165 *lenp -= left; 2290 *lenp -= left;
2166 *ppos += *lenp; 2291 *ppos += *lenp;
2167 return 0; 2292 return err;
2168#undef TMPBUFLEN
2169} 2293}
2170 2294
2171static int do_proc_dointvec(struct ctl_table *table, int write, 2295static int do_proc_dointvec(struct ctl_table *table, int write,
2172 void __user *buffer, size_t *lenp, loff_t *ppos, 2296 void __user *buffer, size_t *lenp, loff_t *ppos,
2173 int (*conv)(int *negp, unsigned long *lvalp, int *valp, 2297 int (*conv)(bool *negp, unsigned long *lvalp, int *valp,
2174 int write, void *data), 2298 int write, void *data),
2175 void *data) 2299 void *data)
2176{ 2300{
@@ -2238,8 +2362,8 @@ struct do_proc_dointvec_minmax_conv_param {
2238 int *max; 2362 int *max;
2239}; 2363};
2240 2364
2241static int do_proc_dointvec_minmax_conv(int *negp, unsigned long *lvalp, 2365static int do_proc_dointvec_minmax_conv(bool *negp, unsigned long *lvalp,
2242 int *valp, 2366 int *valp,
2243 int write, void *data) 2367 int write, void *data)
2244{ 2368{
2245 struct do_proc_dointvec_minmax_conv_param *param = data; 2369 struct do_proc_dointvec_minmax_conv_param *param = data;
@@ -2252,10 +2376,10 @@ static int do_proc_dointvec_minmax_conv(int *negp, unsigned long *lvalp,
2252 } else { 2376 } else {
2253 int val = *valp; 2377 int val = *valp;
2254 if (val < 0) { 2378 if (val < 0) {
2255 *negp = -1; 2379 *negp = true;
2256 *lvalp = (unsigned long)-val; 2380 *lvalp = (unsigned long)-val;
2257 } else { 2381 } else {
2258 *negp = 0; 2382 *negp = false;
2259 *lvalp = (unsigned long)val; 2383 *lvalp = (unsigned long)val;
2260 } 2384 }
2261 } 2385 }
@@ -2295,102 +2419,78 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
2295 unsigned long convmul, 2419 unsigned long convmul,
2296 unsigned long convdiv) 2420 unsigned long convdiv)
2297{ 2421{
2298#define TMPBUFLEN 21 2422 unsigned long *i, *min, *max;
2299 unsigned long *i, *min, *max, val; 2423 int vleft, first = 1, err = 0;
2300 int vleft, first=1, neg; 2424 unsigned long page = 0;
2301 size_t len, left; 2425 size_t left;
2302 char buf[TMPBUFLEN], *p; 2426 char *kbuf;
2303 char __user *s = buffer; 2427
2304 2428 if (!data || !table->maxlen || !*lenp || (*ppos && !write)) {
2305 if (!data || !table->maxlen || !*lenp ||
2306 (*ppos && !write)) {
2307 *lenp = 0; 2429 *lenp = 0;
2308 return 0; 2430 return 0;
2309 } 2431 }
2310 2432
2311 i = (unsigned long *) data; 2433 i = (unsigned long *) data;
2312 min = (unsigned long *) table->extra1; 2434 min = (unsigned long *) table->extra1;
2313 max = (unsigned long *) table->extra2; 2435 max = (unsigned long *) table->extra2;
2314 vleft = table->maxlen / sizeof(unsigned long); 2436 vleft = table->maxlen / sizeof(unsigned long);
2315 left = *lenp; 2437 left = *lenp;
2316 2438
2439 if (write) {
2440 if (left > PAGE_SIZE - 1)
2441 left = PAGE_SIZE - 1;
2442 page = __get_free_page(GFP_TEMPORARY);
2443 kbuf = (char *) page;
2444 if (!kbuf)
2445 return -ENOMEM;
2446 if (copy_from_user(kbuf, buffer, left)) {
2447 err = -EFAULT;
2448 goto free;
2449 }
2450 kbuf[left] = 0;
2451 }
2452
2317 for (; left && vleft--; i++, min++, max++, first=0) { 2453 for (; left && vleft--; i++, min++, max++, first=0) {
2454 unsigned long val;
2455
2318 if (write) { 2456 if (write) {
2319 while (left) { 2457 bool neg;
2320 char c; 2458
2321 if (get_user(c, s)) 2459 left -= proc_skip_spaces(&kbuf);
2322 return -EFAULT; 2460
2323 if (!isspace(c)) 2461 err = proc_get_long(&kbuf, &left, &val, &neg,
2324 break; 2462 proc_wspace_sep,
2325 left--; 2463 sizeof(proc_wspace_sep), NULL);
2326 s++; 2464 if (err)
2327 }
2328 if (!left)
2329 break;
2330 neg = 0;
2331 len = left;
2332 if (len > TMPBUFLEN-1)
2333 len = TMPBUFLEN-1;
2334 if (copy_from_user(buf, s, len))
2335 return -EFAULT;
2336 buf[len] = 0;
2337 p = buf;
2338 if (*p == '-' && left > 1) {
2339 neg = 1;
2340 p++;
2341 }
2342 if (*p < '0' || *p > '9')
2343 break;
2344 val = simple_strtoul(p, &p, 0) * convmul / convdiv ;
2345 len = p-buf;
2346 if ((len < left) && *p && !isspace(*p))
2347 break; 2465 break;
2348 if (neg) 2466 if (neg)
2349 val = -val;
2350 s += len;
2351 left -= len;
2352
2353 if(neg)
2354 continue; 2467 continue;
2355 if ((min && val < *min) || (max && val > *max)) 2468 if ((min && val < *min) || (max && val > *max))
2356 continue; 2469 continue;
2357 *i = val; 2470 *i = val;
2358 } else { 2471 } else {
2359 p = buf; 2472 val = convdiv * (*i) / convmul;
2360 if (!first) 2473 if (!first)
2361 *p++ = '\t'; 2474 err = proc_put_char(&buffer, &left, '\t');
2362 sprintf(p, "%lu", convdiv * (*i) / convmul); 2475 err = proc_put_long(&buffer, &left, val, false);
2363 len = strlen(buf); 2476 if (err)
2364 if (len > left) 2477 break;
2365 len = left;
2366 if(copy_to_user(s, buf, len))
2367 return -EFAULT;
2368 left -= len;
2369 s += len;
2370 } 2478 }
2371 } 2479 }
2372 2480
2373 if (!write && !first && left) { 2481 if (!write && !first && left && !err)
2374 if(put_user('\n', s)) 2482 err = proc_put_char(&buffer, &left, '\n');
2375 return -EFAULT; 2483 if (write && !err)
2376 left--, s++; 2484 left -= proc_skip_spaces(&kbuf);
2377 } 2485free:
2378 if (write) { 2486 if (write) {
2379 while (left) { 2487 free_page(page);
2380 char c; 2488 if (first)
2381 if (get_user(c, s++)) 2489 return err ? : -EINVAL;
2382 return -EFAULT;
2383 if (!isspace(c))
2384 break;
2385 left--;
2386 }
2387 } 2490 }
2388 if (write && first)
2389 return -EINVAL;
2390 *lenp -= left; 2491 *lenp -= left;
2391 *ppos += *lenp; 2492 *ppos += *lenp;
2392 return 0; 2493 return err;
2393#undef TMPBUFLEN
2394} 2494}
2395 2495
2396static int do_proc_doulongvec_minmax(struct ctl_table *table, int write, 2496static int do_proc_doulongvec_minmax(struct ctl_table *table, int write,
@@ -2451,7 +2551,7 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
2451} 2551}
2452 2552
2453 2553
2454static int do_proc_dointvec_jiffies_conv(int *negp, unsigned long *lvalp, 2554static int do_proc_dointvec_jiffies_conv(bool *negp, unsigned long *lvalp,
2455 int *valp, 2555 int *valp,
2456 int write, void *data) 2556 int write, void *data)
2457{ 2557{
@@ -2463,10 +2563,10 @@ static int do_proc_dointvec_jiffies_conv(int *negp, unsigned long *lvalp,
2463 int val = *valp; 2563 int val = *valp;
2464 unsigned long lval; 2564 unsigned long lval;
2465 if (val < 0) { 2565 if (val < 0) {
2466 *negp = -1; 2566 *negp = true;
2467 lval = (unsigned long)-val; 2567 lval = (unsigned long)-val;
2468 } else { 2568 } else {
2469 *negp = 0; 2569 *negp = false;
2470 lval = (unsigned long)val; 2570 lval = (unsigned long)val;
2471 } 2571 }
2472 *lvalp = lval / HZ; 2572 *lvalp = lval / HZ;
@@ -2474,7 +2574,7 @@ static int do_proc_dointvec_jiffies_conv(int *negp, unsigned long *lvalp,
2474 return 0; 2574 return 0;
2475} 2575}
2476 2576
2477static int do_proc_dointvec_userhz_jiffies_conv(int *negp, unsigned long *lvalp, 2577static int do_proc_dointvec_userhz_jiffies_conv(bool *negp, unsigned long *lvalp,
2478 int *valp, 2578 int *valp,
2479 int write, void *data) 2579 int write, void *data)
2480{ 2580{
@@ -2486,10 +2586,10 @@ static int do_proc_dointvec_userhz_jiffies_conv(int *negp, unsigned long *lvalp,
2486 int val = *valp; 2586 int val = *valp;
2487 unsigned long lval; 2587 unsigned long lval;
2488 if (val < 0) { 2588 if (val < 0) {
2489 *negp = -1; 2589 *negp = true;
2490 lval = (unsigned long)-val; 2590 lval = (unsigned long)-val;
2491 } else { 2591 } else {
2492 *negp = 0; 2592 *negp = false;
2493 lval = (unsigned long)val; 2593 lval = (unsigned long)val;
2494 } 2594 }
2495 *lvalp = jiffies_to_clock_t(lval); 2595 *lvalp = jiffies_to_clock_t(lval);
@@ -2497,7 +2597,7 @@ static int do_proc_dointvec_userhz_jiffies_conv(int *negp, unsigned long *lvalp,
2497 return 0; 2597 return 0;
2498} 2598}
2499 2599
2500static int do_proc_dointvec_ms_jiffies_conv(int *negp, unsigned long *lvalp, 2600static int do_proc_dointvec_ms_jiffies_conv(bool *negp, unsigned long *lvalp,
2501 int *valp, 2601 int *valp,
2502 int write, void *data) 2602 int write, void *data)
2503{ 2603{
@@ -2507,10 +2607,10 @@ static int do_proc_dointvec_ms_jiffies_conv(int *negp, unsigned long *lvalp,
2507 int val = *valp; 2607 int val = *valp;
2508 unsigned long lval; 2608 unsigned long lval;
2509 if (val < 0) { 2609 if (val < 0) {
2510 *negp = -1; 2610 *negp = true;
2511 lval = (unsigned long)-val; 2611 lval = (unsigned long)-val;
2512 } else { 2612 } else {
2513 *negp = 0; 2613 *negp = false;
2514 lval = (unsigned long)val; 2614 lval = (unsigned long)val;
2515 } 2615 }
2516 *lvalp = jiffies_to_msecs(lval); 2616 *lvalp = jiffies_to_msecs(lval);
@@ -2607,6 +2707,157 @@ static int proc_do_cad_pid(struct ctl_table *table, int write,
2607 return 0; 2707 return 0;
2608} 2708}
2609 2709
2710/**
2711 * proc_do_large_bitmap - read/write from/to a large bitmap
2712 * @table: the sysctl table
2713 * @write: %TRUE if this is a write to the sysctl file
2714 * @buffer: the user buffer
2715 * @lenp: the size of the user buffer
2716 * @ppos: file position
2717 *
2718 * The bitmap is stored at table->data and the bitmap length (in bits)
2719 * in table->maxlen.
2720 *
2721 * We use a range comma separated format (e.g. 1,3-4,10-10) so that
2722 * large bitmaps may be represented in a compact manner. Writing into
2723 * the file will clear the bitmap then update it with the given input.
2724 *
2725 * Returns 0 on success.
2726 */
2727int proc_do_large_bitmap(struct ctl_table *table, int write,
2728 void __user *buffer, size_t *lenp, loff_t *ppos)
2729{
2730 int err = 0;
2731 bool first = 1;
2732 size_t left = *lenp;
2733 unsigned long bitmap_len = table->maxlen;
2734 unsigned long *bitmap = (unsigned long *) table->data;
2735 unsigned long *tmp_bitmap = NULL;
2736 char tr_a[] = { '-', ',', '\n' }, tr_b[] = { ',', '\n', 0 }, c;
2737
2738 if (!bitmap_len || !left || (*ppos && !write)) {
2739 *lenp = 0;
2740 return 0;
2741 }
2742
2743 if (write) {
2744 unsigned long page = 0;
2745 char *kbuf;
2746
2747 if (left > PAGE_SIZE - 1)
2748 left = PAGE_SIZE - 1;
2749
2750 page = __get_free_page(GFP_TEMPORARY);
2751 kbuf = (char *) page;
2752 if (!kbuf)
2753 return -ENOMEM;
2754 if (copy_from_user(kbuf, buffer, left)) {
2755 free_page(page);
2756 return -EFAULT;
2757 }
2758 kbuf[left] = 0;
2759
2760 tmp_bitmap = kzalloc(BITS_TO_LONGS(bitmap_len) * sizeof(unsigned long),
2761 GFP_KERNEL);
2762 if (!tmp_bitmap) {
2763 free_page(page);
2764 return -ENOMEM;
2765 }
2766 proc_skip_char(&kbuf, &left, '\n');
2767 while (!err && left) {
2768 unsigned long val_a, val_b;
2769 bool neg;
2770
2771 err = proc_get_long(&kbuf, &left, &val_a, &neg, tr_a,
2772 sizeof(tr_a), &c);
2773 if (err)
2774 break;
2775 if (val_a >= bitmap_len || neg) {
2776 err = -EINVAL;
2777 break;
2778 }
2779
2780 val_b = val_a;
2781 if (left) {
2782 kbuf++;
2783 left--;
2784 }
2785
2786 if (c == '-') {
2787 err = proc_get_long(&kbuf, &left, &val_b,
2788 &neg, tr_b, sizeof(tr_b),
2789 &c);
2790 if (err)
2791 break;
2792 if (val_b >= bitmap_len || neg ||
2793 val_a > val_b) {
2794 err = -EINVAL;
2795 break;
2796 }
2797 if (left) {
2798 kbuf++;
2799 left--;
2800 }
2801 }
2802
2803 while (val_a <= val_b)
2804 set_bit(val_a++, tmp_bitmap);
2805
2806 first = 0;
2807 proc_skip_char(&kbuf, &left, '\n');
2808 }
2809 free_page(page);
2810 } else {
2811 unsigned long bit_a, bit_b = 0;
2812
2813 while (left) {
2814 bit_a = find_next_bit(bitmap, bitmap_len, bit_b);
2815 if (bit_a >= bitmap_len)
2816 break;
2817 bit_b = find_next_zero_bit(bitmap, bitmap_len,
2818 bit_a + 1) - 1;
2819
2820 if (!first) {
2821 err = proc_put_char(&buffer, &left, ',');
2822 if (err)
2823 break;
2824 }
2825 err = proc_put_long(&buffer, &left, bit_a, false);
2826 if (err)
2827 break;
2828 if (bit_a != bit_b) {
2829 err = proc_put_char(&buffer, &left, '-');
2830 if (err)
2831 break;
2832 err = proc_put_long(&buffer, &left, bit_b, false);
2833 if (err)
2834 break;
2835 }
2836
2837 first = 0; bit_b++;
2838 }
2839 if (!err)
2840 err = proc_put_char(&buffer, &left, '\n');
2841 }
2842
2843 if (!err) {
2844 if (write) {
2845 if (*ppos)
2846 bitmap_or(bitmap, bitmap, tmp_bitmap, bitmap_len);
2847 else
2848 memcpy(bitmap, tmp_bitmap,
2849 BITS_TO_LONGS(bitmap_len) * sizeof(unsigned long));
2850 }
2851 kfree(tmp_bitmap);
2852 *lenp -= left;
2853 *ppos += *lenp;
2854 return 0;
2855 } else {
2856 kfree(tmp_bitmap);
2857 return err;
2858 }
2859}
2860
2610#else /* CONFIG_PROC_FS */ 2861#else /* CONFIG_PROC_FS */
2611 2862
2612int proc_dostring(struct ctl_table *table, int write, 2863int proc_dostring(struct ctl_table *table, int write,