lkml.org 
[lkml]   [2016]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 12/17] s390/debug: Use memdup_user() rather than duplicating its implementation
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 2 Sep 2016 08:45:26 +0200

    Reuse existing functionality from memdup_user() instead of keeping
    duplicate source code.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    arch/s390/kernel/debug.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
    index 4a12faf..a9fcf72 100644
    --- a/arch/s390/kernel/debug.c
    +++ b/arch/s390/kernel/debug.c
    @@ -1162,13 +1162,9 @@ debug_get_user_string(const char __user *user_buf, size_t user_len)
    {
    char* buffer;

    - buffer = kmalloc(user_len + 1, GFP_KERNEL);
    - if (!buffer)
    - return ERR_PTR(-ENOMEM);
    - if (copy_from_user(buffer, user_buf, user_len) != 0) {
    - kfree(buffer);
    - return ERR_PTR(-EFAULT);
    - }
    + buffer = memdup_user(user_buf, user_len + 1);
    + if (IS_ERR(buffer))
    + return PTR_ERR(buffer);
    /* got the string, now strip linefeed. */
    if (buffer[user_len - 1] == '\n')
    buffer[user_len - 1] = 0;
    --
    2.9.3
    \
     
     \ /
      Last update: 2016-09-17 09:58    [W:4.040 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site