[PATCH] powerpc/cell: strncpy does not null terminate string
Roel Kluin
roel.kluin at gmail.com
Fri Jul 17 22:41:41 EST 2009
With `sizeof(string) - 1` strncpy() will null terminate the string.
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
---
To test this:
#include <stdio.h>
#include <string.h>
char a[10];
char b[10];
int main()
{
const char* str = "0123456789012";
strncpy(a, str, sizeof(a));
strncpy(b, str, sizeof(b) - 1);
printf("String a was %s, b was %s\n", a, b);
return 0;
}
Output:
String a was 0123456789012345678, b was 012345678
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index 07c234f..cfdbadb 100644
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -80,7 +80,7 @@ static void celleb_show_cpuinfo(struct seq_file *m)
static int __init celleb_machine_type_hack(char *ptr)
{
- strncpy(celleb_machine_type, ptr, sizeof(celleb_machine_type));
+ strncpy(celleb_machine_type, ptr, sizeof(celleb_machine_type) - 1);
celleb_machine_type[sizeof(celleb_machine_type)-1] = 0;
return 0;
}
More information about the Linuxppc-dev
mailing list