]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Blackfin: strncpy: fix handling of zero lengths
authorSteven Miao <realmz6@gmail.com>
Wed, 1 Jun 2011 07:52:41 +0000 (15:52 +0800)
committerMike Frysinger <vapier@gentoo.org>
Fri, 3 Jun 2011 15:05:36 +0000 (11:05 -0400)
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>
arch/blackfin/lib/strncpy.S

index f3931d50b4a715a50878363a43bd14e9c63b9dd1..2c07dddac9956bd24da0603910c9a7d35957f42b 100644 (file)
@@ -25,7 +25,7 @@
 
 ENTRY(_strncpy)
        CC = R2 == 0;
-       if CC JUMP 4f;
+       if CC JUMP 6f;
 
        P2 = R2 ;       /* size */
        P0 = R0 ;       /* dst*/