From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754079AbcICMaX (ORCPT ); Sat, 3 Sep 2016 08:30:23 -0400 Received: from mout.web.de ([212.227.17.12]:53486 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953AbcICMaT (ORCPT ); Sat, 3 Sep 2016 08:30:19 -0400 Subject: [PATCH 12/17] s390/debug: Use memdup_user() rather than duplicating its implementation To: linux-s390@vger.kernel.org, David Hildenbrand , Heiko Carstens , Joe Perches , Martin Schwidefsky References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: Date: Sat, 3 Sep 2016 14:30:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:/vUrBMB6syT3oqsYFe8araMImLxlQOCxdsuMZ5u7xytjJN1I8Mn EWdgAAE3+4L9z9Vax2YkQF8GQnGxmq+7QN4y9+7mnWiwS4ZUTeoFU+oFO+10BmYAWPbyYJS Mvex/XCcDwoP7p9F2iMoNhgw6P2NK4UQa3zc26vas2YMnAZBq7LHHK8n5yEvNcLVDUKp560 Vl7oPCNMhiU0xQsLCLxxw== X-UI-Out-Filterresults: notjunk:1;V01:K0:tVIa0r8Hu/k=:3ziIpltB1iI/8zHJ7E9IzL ixaK+cZ3g8cRVKu8VGmnSop7bwuF+/HN3T6aDZbAqpfyNMhzCK8YvXyJPP0Xf8jYou6cNPKbp TAxmd4DImlNbAAVrRq1Ol/4gHO16gOQcBAalCpVO6GMgV6g7RBmrUfn9SsxAkYRJZ0/Z2DHCX sG4etDjdDuvDO29DwDSRVeZIBS+8BiB15mws1c/ahxuoDj4mNRS4pbLI8J1xfAH8i++M4IVth d7WKhJzRQHa6MvZYD/vdmmDlBBa0xljCVJfyft5SzyfPl/pFRQIsP2v6m2gxfdk7nm/TnqqAS HFCMaE7rn7Umw9R9VM36csgwdOMNGRzREa9pkXJYf7mubeqkXocIkVOIPhdJTDM6KfEzlfgsB +tPPV3lfjZUmEZTPeS7j3XNC3FkFIQI19cgJd2ZV/nEGTWjOtos2TzrDVX0xHWfYz8/o/KRRO +wZXuf/KTwKWQY3nz19QVexFQKsqQioWTQX4jH79GcBUx5tHDajkd1vf4vLVwYY0znwiZTCUE qpF7FKkt0lB3BJ2Ixv0CFFIMytVwLz2P48fAzU+I9HG3fGLkZ/n5dNd2x8BvkF8XlWv2IuyIH nnTE+WMTmoYti7+WECkitkyi2ccxIMd78lPxmyhbwERF4tRsqy85z/1KRUgj1Kr1ww946D6Qf KuFVvbnt23xnduwZDskTU5xLNQCNYnOv4RQfmaYCm+mqESSWyXL8ztbU+N5QM4Mn6Q+xumzed VMCtTNnGozR+XI1YyqF+IlRWMSdZzX1MWJ5Uvc+Qq/bZVZztwVnYYiwo2k0CuynXukIPdtvUs zd4ByCy Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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