diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 20:11:29 +0100 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /arch/mips/pmc-sierra/yosemite/prom.c | |
| parent | slub: disallow changing cpu_partial from userspace for debug caches (diff) | |
| parent | slub: add missed accounting (diff) | |
| download | linux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz linux-5878cf431ca7233a56819ca6970153ac0b129599.zip | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/prom.c')
| -rw-r--r-- | arch/mips/pmc-sierra/yosemite/prom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c index cf4c868715ac..dcc926e06fce 100644 --- a/arch/mips/pmc-sierra/yosemite/prom.c +++ b/arch/mips/pmc-sierra/yosemite/prom.c @@ -102,7 +102,7 @@ void __init prom_init(void) /* Get the boot parameters */ for (i = 1; i < argc; i++) { - if (strlen(arcs_cmdline) + strlen(arg[i] + 1) >= + if (strlen(arcs_cmdline) + strlen(arg[i]) + 1 >= sizeof(arcs_cmdline)) break; |