Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

673c790e · Linus Torvalds <[email protected]> · 2018-10-29 09:04:26 -07:00

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

Commit: 673c790e72822ee433931ea701e4fceef75a0eac
Parents: 83e7e5b5 · 381fdd62

Merge commit. Changes below are compared with the first parent: 83e7e5b5.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/m68k/kernel/uboot.c	modified	+1	−1	View file

arch/m68k/kernel/uboot.c

View file

diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
index b29c3b2..1070828 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;
 }