summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@163.com>2015-10-01 18:37:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-05 05:47:09 +0200
commit7c22e645cd742b82ec232e4f2328fc53d247ccea (patch)
treebda53e1c647782de44579f2a9d34a127962dc91b /drivers/pcmcia
parentmemory: ti-aemif: Fix module autoload for OF platform driver (diff)
downloadlinux-7c22e645cd742b82ec232e4f2328fc53d247ccea.tar.xz
linux-7c22e645cd742b82ec232e4f2328fc53d247ccea.zip
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>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ds.c4
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)
if ((length < 2) || (length > 255))
continue;
- new = kmalloc(sizeof(char) * length, GFP_KERNEL);
+ new = kstrdup(tmp, GFP_KERNEL);
if (!new)
continue;
- new = strncpy(new, tmp, length);
-
tmp = p_dev->prod_id[i];
p_dev->prod_id[i] = new;
kfree(tmp);