diff options
author | Geliang Tang <geliangtang@163.com> | 2015-10-01 12:37:57 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-04 23:47:09 -0400 |
commit | 7c22e645cd742b82ec232e4f2328fc53d247ccea (patch) | |
tree | bda53e1c647782de44579f2a9d34a127962dc91b | |
parent | df6be790623f11c0db8152e724f4951cd944ffe2 (diff) |
pcmcia: use kstrdup() in pcmcia_device_query()
Use kstrdup instead of kmalloc and strncpy.
Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/pcmcia/ds.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 0decee6c556e..489ea1098c96 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -468,12 +468,10 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev) | |||
468 | if ((length < 2) || (length > 255)) | 468 | if ((length < 2) || (length > 255)) |
469 | continue; | 469 | continue; |
470 | 470 | ||
471 | new = kmalloc(sizeof(char) * length, GFP_KERNEL); | 471 | new = kstrdup(tmp, GFP_KERNEL); |
472 | if (!new) | 472 | if (!new) |
473 | continue; | 473 | continue; |
474 | 474 | ||
475 | new = strncpy(new, tmp, length); | ||
476 | |||
477 | tmp = p_dev->prod_id[i]; | 475 | tmp = p_dev->prod_id[i]; |
478 | p_dev->prod_id[i] = new; | 476 | p_dev->prod_id[i] = new; |
479 | kfree(tmp); | 477 | kfree(tmp); |