Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBI: fix use-after-free on error path
  UBI: fix missing scrub when there is a bit-flip
  UBIFS: Use kmemdup rather than duplicating its implementation

3 files changed, 5 insertions, 10 deletions

diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c
index 6189c74d97f0..66d59d0a1402 100644
--- a/fs/ubifs/lpt.c
+++ b/fs/ubifs/lpt.c
@@ -1986,12 +1986,11 @@ again:
 
                                 if (path[h].in_tree)
                                         continue;
-                                nnode = kmalloc(sz, GFP_NOFS);
+                                nnode = kmemdup(&path[h].nnode, sz, GFP_NOFS);
                                 if (!nnode) {
                                         err = -ENOMEM;
                                         goto out;
                                 }
-                                memcpy(nnode, &path[h].nnode, sz);
                                 parent = nnode->parent;
                                 parent->nbranch[nnode->iip].nnode = nnode;
                                 path[h].ptr.nnode = nnode;
@@ -2004,12 +2003,11 @@ again:
                                 const size_t sz = sizeof(struct ubifs_pnode);
                                 struct ubifs_nnode *parent;
 
-                                pnode = kmalloc(sz, GFP_NOFS);
+                                pnode = kmemdup(&path[h].pnode, sz, GFP_NOFS);
                                 if (!pnode) {
                                         err = -ENOMEM;
                                         goto out;
                                 }
-                                memcpy(pnode, &path[h].pnode, sz);
                                 parent = pnode->parent;
                                 parent->nbranch[pnode->iip].pnode = pnode;
                                 path[h].ptr.pnode = pnode;
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
index 066738647685..e14ee53159db 100644
--- a/fs/ubifs/tnc.c
+++ b/fs/ubifs/tnc.c
@@ -344,12 +344,11 @@ static int lnc_add(struct ubifs_info *c, struct ubifs_zbranch *zbr,
                 return err;
         }
 
-        lnc_node = kmalloc(zbr->len, GFP_NOFS);
+        lnc_node = kmemdup(node, zbr->len, GFP_NOFS);
         if (!lnc_node)
                 /* We don't have to have the cache, so no error */
                 return 0;
 
-        memcpy(lnc_node, node, zbr->len);
         zbr->leaf = lnc_node;
         return 0;
 }
diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
index bf18f7a04544..85b272268754 100644
--- a/fs/ubifs/xattr.c
+++ b/fs/ubifs/xattr.c
@@ -138,12 +138,11 @@ static int create_xattr(struct ubifs_info *c, struct inode *host,
         ui = ubifs_inode(inode);
         ui->xattr = 1;
         ui->flags |= UBIFS_XATTR_FL;
-        ui->data = kmalloc(size, GFP_NOFS);
+        ui->data = kmemdup(value, size, GFP_NOFS);
         if (!ui->data) {
                 err = -ENOMEM;
                 goto out_free;
         }
-        memcpy(ui->data, value, size);
         inode->i_size = ui->ui_size = size;
         ui->data_len = size;
 
@@ -204,12 +203,11 @@ static int change_xattr(struct ubifs_info *c, struct inode *host,
                 return err;
 
         kfree(ui->data);
-        ui->data = kmalloc(size, GFP_NOFS);
+        ui->data = kmemdup(value, size, GFP_NOFS);
         if (!ui->data) {
                 err = -ENOMEM;
                 goto out_free;
         }
-        memcpy(ui->data, value, size);
         inode->i_size = ui->ui_size = size;
         ui->data_len = size;