From ecdaa7c9207615a1dc5882560095389a18b1e2ca Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 5 Jun 2013 15:44:52 -0700 Subject: BZ #15583: r7 uninitialized in strcpy.S when ARM_HAS_T2 undefined --- NEWS | 2 +- ports/ChangeLog.arm | 6 ++++++ ports/sysdeps/arm/armv6/strcpy.S | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 3068b788a8..99c0c9491d 100644 --- a/NEWS +++ b/NEWS @@ -19,7 +19,7 @@ Version 2.18 15336, 15337, 15339, 15342, 15346, 15359, 15361, 15366, 15380, 15381, 15394, 15395, 15405, 15406, 15409, 15416, 15418, 15419, 15423, 15424, 15426, 15429, 15441, 15442, 15448, 15465, 15480, 15485, 15488, 15490, - 15493, 15497, 15506, 15529, 15536, 15553. + 15493, 15497, 15506, 15529, 15536, 15553, 15583. * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla #15078). diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 4c73bb31a4..37eac21286 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,9 @@ +2013-06-05 Richard Henderson + + [BZ #15583] + * sysdeps/arm/armv6/strcpy.S (strcpy): Fix register usage in + non ARCH_HAS_T2 case. + 2013-06-05 Joseph Myers * sysdeps/arm/machine-gmon.h: Remove trailing whitespace. diff --git a/ports/sysdeps/arm/armv6/strcpy.S b/ports/sysdeps/arm/armv6/strcpy.S index cd13ff7ecf..69e82d8314 100644 --- a/ports/sysdeps/arm/armv6/strcpy.S +++ b/ports/sysdeps/arm/armv6/strcpy.S @@ -89,7 +89,7 @@ ENTRY (strcpy) tst r0, #3 @ Test alignment of DEST movt r7, #0x0101 #else - ldr ip, =0x01010101 + ldr r7, =0x01010101 tst r0, #3 #endif bne .Lunaligned -- cgit v1.2.3