lkml.org 
[lkml]   [2015]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 22/31] fs/ntfs: use kmemdup rather than duplicating its implementation
    Date
    The patch was generated using fixed coccinelle semantic patch
    scripts/coccinelle/api/memdup.cocci [1].

    [1]: http://permalink.gmane.org/gmane.linux.kernel/2014320

    Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
    ---
    fs/ntfs/dir.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
    index 9e38daf..2b7fef0 100644
    --- a/fs/ntfs/dir.c
    +++ b/fs/ntfs/dir.c
    @@ -1172,14 +1172,13 @@ static int ntfs_readdir(struct file *file, struct dir_context *actor)
    * map the mft record without deadlocking.
    */
    rc = le32_to_cpu(ctx->attr->data.resident.value_length);
    - ir = kmalloc(rc, GFP_NOFS);
    + /* Copy the index root value (it has been verified in read_inode). */
    + ir = kmemdup((u8 *)ctx->attr + le16_to_cpu(ctx->attr->data.resident.value_offset),
    + rc, GFP_NOFS);
    if (unlikely(!ir)) {
    err = -ENOMEM;
    goto err_out;
    }
    - /* Copy the index root value (it has been verified in read_inode). */
    - memcpy(ir, (u8*)ctx->attr +
    - le16_to_cpu(ctx->attr->data.resident.value_offset), rc);
    ntfs_attr_put_search_ctx(ctx);
    unmap_mft_record(ndir);
    ctx = NULL;
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-08-07 10:21    [W:7.241 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site