aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2011-06-01 15:52:41 +0800
committerMike Frysinger <vapier@gentoo.org>2011-06-03 11:05:36 -0400
commit5ff6197f828d5ea051b3abf77cb61f8a34480e8d (patch)
tree4d40c726ed8b09f1cd184f972641edc99a8c07b8
parent1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c (diff)
downloadlinux-stericsson-5ff6197f828d5ea051b3abf77cb61f8a34480e8d.tar.gz
Blackfin: strncpy: fix handling of zero lengths
The jump to 4f will cause the NUL padding loop to run at least one time, so if string length is zero just jump to the end. Otherwise we wrongly write one NUL byte when size==0. Signed-off-by: Steven Miao <realmz6@gmail.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/lib/strncpy.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/strncpy.S b/arch/blackfin/lib/strncpy.S
index f3931d50b4a7..2c07dddac995 100644
--- a/arch/blackfin/lib/strncpy.S
+++ b/arch/blackfin/lib/strncpy.S
@@ -25,7 +25,7 @@
ENTRY(_strncpy)
CC = R2 == 0;
- if CC JUMP 4f;
+ if CC JUMP 6f;
P2 = R2 ; /* size */
P0 = R0 ; /* dst*/