diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-29 17:04:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-10-29 17:04:26 +0100 |
| commit | 673c790e72822ee433931ea701e4fceef75a0eac (patch) | |
| tree | 78152c0b1098044984473789b4c9d40671b2a38e /arch/m68k | |
| parent | Merge tag 'm68k-for-v4.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | m68k: fix command-line parsing when passed from u-boot (diff) | |
| download | linux-673c790e72822ee433931ea701e4fceef75a0eac.tar.xz linux-673c790e72822ee433931ea701e4fceef75a0eac.zip | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68k nommu fix from Greg Ungerer:
"Only a single change to fix an out of bounds array access when parsing
boot command line"
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k: fix command-line parsing when passed from u-boot
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/uboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c index b29c3b241e1b..107082877064 100644 --- a/arch/m68k/kernel/uboot.c +++ b/arch/m68k/kernel/uboot.c @@ -102,5 +102,5 @@ __init void process_uboot_commandline(char *commandp, int size) } parse_uboot_commandline(commandp, len); - commandp[size - 1] = 0; + commandp[len - 1] = 0; } |