Merge tag 'omap-for-v3.10/dt-fixes-for-merge-window' of git://git.kernel.org/pub...

[karo-tx-linux.git] / drivers / block / aoe / aoechr.c

diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 42e67ad6bd207dabd505c779e131b9465dad3e82..ab41be625a5316e30ae2f30d1329e657196e98e2 100644 (file)
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -139,13 +139,12 @@ bail:             spin_unlock_irqrestore(&emsgs_lock, flags);
                return;
        }
 
-       mp = kmalloc(n, GFP_ATOMIC);
+       mp = kmemdup(msg, n, GFP_ATOMIC);
        if (mp == NULL) {
                printk(KERN_ERR "aoe: allocation failure, len=%ld\n", n);
                goto bail;
        }
 
-       memcpy(mp, msg, n);
        em->msg = mp;
        em->flags |= EMFL_VALID;
        em->len = n;