From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757914AbcHYIYB (ORCPT ); Thu, 25 Aug 2016 04:24:01 -0400 Received: from mout.web.de ([217.72.192.78]:55609 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756711AbcHYIXv (ORCPT ); Thu, 25 Aug 2016 04:23:51 -0400 Subject: [PATCH 1/2] sparc: Use kmalloc_array() in three functions To: sparclinux@vger.kernel.org, "David S. Miller" References: <0ca0235c-ddb9-0534-3bde-b4aaa48da92e@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Paolo Bonzini From: SF Markus Elfring Message-ID: Date: Thu, 25 Aug 2016 10:22:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <0ca0235c-ddb9-0534-3bde-b4aaa48da92e@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:KGb54C0NqdOhxCrCJv8VoIH5tHkcNVWJLr8Hy1q2fxjycl8M0yB YchFDqcfqujIG+Iy3OEpTyFrI+5JpD5FUCt9u+mPy1vHhhqFzLkBkh0Lfw9fj6nkQDD36ne Z0+vFW4ocbMQ7d2O0SUEYYLuqAtfRsFW5IbLuKctTCtFYqmC2DLd0xoIbakynFfPdj+7No6 pqATHuIuqwMp1+ggxfoyw== X-UI-Out-Filterresults: notjunk:1;V01:K0:XXDrt5BkmjE=:F1yZuLqy61UnHPdra429Rl xGaR6YAsgkptTJOBs1HzAyd96EUi/1S7uZGTN1UC0h5WN6qeYH8mvBKv84C0qoT/YP8GBFAYO zi3pcVsUMNdRzKs1obq9LcpX0ZiwyNStzg2a87ULgJpK0SKeiDQR3Sl5fpZr3lpMhU9LShUK2 hzY8YUryZbSihlglncUJPiwvbQ5IdaSsD3POZSgYAYN4JFcvxZ+gEZHK9z97icwArlHSyK2tV KgVzkuPYzksv04ksmpqRZJ5mtEaUsAvdK8XBf7f3CinENqu7ZNgys+8E1sBhNUkx7FHXL83C0 tfbjt0hWErplmwxYOHknh7O+3D4gkfu1mmomb+S/G98vkNpc0OKkSx+wqOnNJpJcGj3mdfjKt KsTUMtL9F9QvZpfZzO5i7AVZi7Qp9Q6FpONoqOUqNu9dLX9krkpKmT0l40HJrmoBGfPaxaXTC aXmDLfS93SkEKVqLwebr/Pz8oiO/HvcY+YW7+7YNaiz1MVLLqrISPdODKCGWNuxqVC8YPvCQz TdNzIfLAcaDiEK8hicP9ZeY6XyHpRb0QR3vu/A3ROCZwGdu3h97S1B0F1uPoUOzGraUiqWctE xBewXBZakfU9/6s1WRLlYTNMwXugVMFabIWWjYPVX5NlvamuqkG+qe9B28v907HCw9lXj5Y11 Kz+3P+/1gNeTd3FFXejBOoeNEQ8racs5w8Q7ZfLwJNk8GcQWVo+FelxGjDJ67gBHofbLDqifj iPgLHyCT0Dj+0YL2dAco8YattrGwa3qz37+cS2fXP07d2Yuy1YtqoYjRTs4NMpyDa6zNgdAkX 5cLOjA4oQbkzgylMYU9D1k3RwxrtQ== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 25 Aug 2016 09:52:44 +0200 * Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus reuse the corresponding function "kmalloc_array". This issue was detected by using the Coccinelle software. * Replace the specifications of data types by pointer dereferences to make the corresponding size determination a bit safer according to the Linux coding style convention. Signed-off-by: Markus Elfring --- arch/sparc/kernel/led.c | 2 +- arch/sparc/kernel/nmi.c | 4 +++- arch/sparc/kernel/sys_sparc_64.c | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 3ae36f3..7444e4a 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c @@ -69,7 +69,7 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer, if (count > LED_MAX_LENGTH) count = LED_MAX_LENGTH; - buf = kmalloc(sizeof(char) * (count + 1), GFP_KERNEL); + buf = kmalloc_array(count + 1, sizeof(*buf), GFP_KERNEL); if (!buf) return -ENOMEM; diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index a9973bb..b88e97b 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c @@ -166,7 +166,9 @@ static int __init check_nmi_watchdog(void) if (!atomic_read(&nmi_active)) return 0; - prev_nmi_count = kmalloc(nr_cpu_ids * sizeof(unsigned int), GFP_KERNEL); + prev_nmi_count = kmalloc_array(nr_cpu_ids, + sizeof(*prev_nmi_count), + GFP_KERNEL); if (!prev_nmi_count) { err = -ENOMEM; goto error; diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index fe8b8ee..25b7a14 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -580,8 +580,10 @@ SYSCALL_DEFINE5(utrap_install, utrap_entry_t, type, unsigned long *p = current_thread_info()->utraps; current_thread_info()->utraps = - kmalloc((UT_TRAP_INSTRUCTION_31+1)*sizeof(long), - GFP_KERNEL); + kmalloc_array(UT_TRAP_INSTRUCTION_31 + 1, + sizeof(*current_thread_info() + ->utraps), + GFP_KERNEL); if (!current_thread_info()->utraps) { current_thread_info()->utraps = p; return -ENOMEM; -- 2.9.3