Prev: [PATCH] anon_inode: set S_IFREG on the anon_inode
Next: [PATCH] inotify_user.c: make local symbol static
From: Julia Lawall on 14 May 2010 16:20
This introduced an unused variable. I will send a revised version
shortly.

julia


On Fri, 14 May 2010, Julia Lawall wrote:

> From: Julia Lawall <julia(a)diku.dk>
>
> 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(a)diku.dk>
>
> ---
> 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 linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Julia Lawall on 14 May 2010 17:10
From: Julia Lawall <julia(a)diku.dk>

Use kstrdup when the goal of an allocation is copy a string into the
allocated region. Additionally drop the now unused variable len.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to;
expression flag,E1,E2;
statement S;
@@

- to = kmalloc(strlen(from) + 1,flag);
+ to = kstrdup(from, flag);
... when != \(from = E1 \| to = E1 \)
if (to==NULL || ...) S
... when != \(from = E2 \| to = E2 \)
- strcpy(to, from);
// </smpl>

Signed-off-by: Julia Lawall <julia(a)diku.dk>

---
drivers/s390/char/keyboard.c | 7 +++----
1 file changed, 3 insertions(+), 4 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
@@ -49,7 +49,7 @@ static unsigned char ret_diacr[NR_DEAD]
struct kbd_data *
kbd_alloc(void) {
struct kbd_data *kbd;
- int i, len;
+ int i;

kbd = kzalloc(sizeof(struct kbd_data), GFP_KERNEL);
if (!kbd)
@@ -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 linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Martin Schwidefsky on 17 May 2010 06:30
On Fri, 14 May 2010 23:03:51 +0200 (CEST)
Julia Lawall <julia(a)diku.dk> wrote:

> From: Julia Lawall <julia(a)diku.dk>
>
> Use kstrdup when the goal of an allocation is copy a string into the
> allocated region. Additionally drop the now unused variable len.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression from,to;
> expression flag,E1,E2;
> statement S;
> @@
>
> - to = kmalloc(strlen(from) + 1,flag);
> + to = kstrdup(from, flag);
> ... when != \(from = E1 \| to = E1 \)
> if (to==NULL || ...) S
> ... when != \(from = E2 \| to = E2 \)
> - strcpy(to, from);
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia(a)diku.dk>

Added to git390, thanks Julia.

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH] anon_inode: set S_IFREG on the anon_inode
Next: [PATCH] inotify_user.c: make local symbol static