GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm/page_alloc.c: add additional checking and return value for the 'table->data'

Browse source 
- check the length of the procfs data before copying it into a fixed
  size array.

- when __parse_numa_zonelist_order() fails, save the error code for
  return.

- 'char*' --> 'char *' coding style fix

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Chen Gang 2013-07-03 15:02:35 -07:00 • committed by Linus Torvalds
parent c53954a092
commit dacbde0963
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mm/page_alloc.c
View file

@ -3256,18 +3256,25 @@ int numa_zonelist_order_handler(ctl_table *table, int write,
static DEFINE_MUTEX(zl_order_mutex); static DEFINE_MUTEX(zl_order_mutex);
mutex_lock(&zl_order_mutex); mutex_lock(&zl_order_mutex);
if (write) if (write) {
strcpy(saved_string, (char*)table->data); if (strlen((char *)table->data) >= NUMA_ZONELIST_ORDER_LEN) {
ret = -EINVAL;
goto out;
}
strcpy(saved_string, (char *)table->data);
}
ret = proc_dostring(table, write, buffer, length, ppos); ret = proc_dostring(table, write, buffer, length, ppos);
if (ret) if (ret)
goto out; goto out;
if (write) { if (write) {
int oldval = user_zonelist_order; int oldval = user_zonelist_order;
if (__parse_numa_zonelist_order((char*)table->data)) {
ret = __parse_numa_zonelist_order((char *)table->data);
if (ret) {
/* /*
* bogus value. restore saved string * bogus value. restore saved string
*/ */
strncpy((char*)table->data, saved_string, strncpy((char *)table->data, saved_string,
NUMA_ZONELIST_ORDER_LEN); NUMA_ZONELIST_ORDER_LEN);
user_zonelist_order = oldval; user_zonelist_order = oldval;
} else if (oldval != user_zonelist_order) { } else if (oldval != user_zonelist_order) {