diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 22:57:19 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 22:57:19 (GMT) |
| commit | 5c395ae7033099fc657114ea997858aa622f08b2 (patch) | |
| tree | f714c8d8db528274de2da4f8aa64b69af0d2aa5e /fs/ubifs/lpt.c | |
| parent | 49d41bae46f15da528ef9848fd7c9d38582aa8e9 (diff) | |
| parent | e57e0d8e818512047fe379157c3f77f1b9fabffb (diff) | |
| download | linux-fsl-qoriq-5c395ae7033099fc657114ea997858aa622f08b2.tar.xz | |
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
Diffstat (limited to 'fs/ubifs/lpt.c')
| -rw-r--r-- | fs/ubifs/lpt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index 6189c74..66d59d0 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; |