aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-29 09:04:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-29 09:04:26 -0700
commit673c790e72822ee433931ea701e4fceef75a0eac (patch)
tree78152c0b1098044984473789b4c9d40671b2a38e
parent83e7e5b54417e20aea7ce571a19af331a539027e (diff)
parent381fdd62c38344a771aed06adaf14aae65c47454 (diff)
download96b-common-673c790e72822ee433931ea701e4fceef75a0eac.tar.gz
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
-rw-r--r--arch/m68k/kernel/uboot.c2
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;
}