kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

memsw: handle swapaccount kernel parameter correctly

Browse source 
__setup based kernel command line parameters handlers which are handled in
obsolete_checksetup are provided with the parameter value including =
(more precisely everything right after the parameter name).

This means that the current implementation of swapaccount[=1|0] doesn't
work at all because if there is a value for the parameter then we are
testing for "0" resp.  "1" but we are getting "=0" resp.  "=1" and if
there is no parameter value we are getting an empty string rather than
NULL.

The original noswapccount parameter, which doesn't care about the value,
works correctly.

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michal Hocko 2011-02-01 15:52:30 -08:00 committed by Linus Torvalds
parent afe8a88755
commit fceda1bf49
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mm/memcontrol.c
View file

@ -5024,9 +5024,9 @@ struct cgroup_subsys mem_cgroup_subsys = {
static int __init enable_swap_account(char *s)
{
/* consider enabled if no parameter or 1 is given */
if (!s || !strcmp(s, "1"))
if (!(*s) || !strcmp(s, "=1"))
really_do_swap_account = 1;
else if (!strcmp(s, "0"))
else if (!strcmp(s, "=0"))
really_do_swap_account = 0;
return 1;
}
@ -5034,7 +5034,7 @@ __setup("swapaccount", enable_swap_account);
static int __init disable_swap_account(char *s)
{
enable_swap_account("0");
enable_swap_account("=0");
return 1;
}
__setup("noswapaccount", disable_swap_account);