From: Julia Lawall <julia@xxxxxxx> Use kstrdup when the goal of an allocation is copy a string into the allocated region. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,from,to; expression flag,E1,E2,E3; statement S; @@ - x = strlen(from) + 1; ... when != \( x = E1 \| from = E1 \) - to = \(kmalloc\|kzalloc\)(x,flag); + to = kstrdup(from, flag); ... when != \(x = E2 \| from = E2 \| to = E2 \) if (to==NULL || ...) S ... when != \(x = E3 \| from = E3 \| to = E3 \) - memcpy(to, from, x); // </smpl> Signed-off-by: Julia Lawall <julia@xxxxxxx> --- drivers/s390/char/keyboard.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -u -p a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c @@ -72,11 +72,10 @@ kbd_alloc(void) { goto out_maps; for (i = 0; i < ARRAY_SIZE(func_table); i++) { if (func_table[i]) { - len = strlen(func_table[i]) + 1; - kbd->func_table[i] = kmalloc(len, GFP_KERNEL); + kbd->func_table[i] = kstrdup(func_table[i], + GFP_KERNEL); if (!kbd->func_table[i]) goto out_func; - memcpy(kbd->func_table[i], func_table[i], len); } } kbd->fn_handler = -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
