From patchwork Sat May 15 21:22:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 99910 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4FLNasX016966 for ; Sat, 15 May 2010 21:23:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754078Ab0EOVWI (ORCPT ); Sat, 15 May 2010 17:22:08 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:51463 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458Ab0EOVWF (ORCPT ); Sat, 15 May 2010 17:22:05 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw1.diku.dk (Postfix) with ESMTP id D5E5D52C3EB; Sat, 15 May 2010 23:22:04 +0200 (CEST) Received: from mgw1.diku.dk ([127.0.0.1]) by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BTSyZhGEJnQZ; Sat, 15 May 2010 23:22:00 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw1.diku.dk (Postfix) with ESMTP id 85F0552C3EF; Sat, 15 May 2010 23:22:00 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 0B32C6DFD13; Sat, 15 May 2010 23:14:49 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 6AB8E200BE; Sat, 15 May 2010 23:22:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 5E15F200BC; Sat, 15 May 2010 23:22:00 +0200 (CEST) Date: Sat, 15 May 2010 23:22:00 +0200 (CEST) From: Julia Lawall To: Miloslav Trmac , Dmitry Torokhov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 29/37] drivers/input/misc: Use kmemdup Message-ID: MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 15 May 2010 21:23:37 +0000 (UTC) diff -u -p a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c @@ -983,11 +983,11 @@ static int __init copy_keymap(void) for (key = keymap; key->type != KE_END; key++) length++; - new_keymap = kmalloc(length * sizeof(struct key_entry), GFP_KERNEL); + new_keymap = kmemdup(keymap, length * sizeof(struct key_entry), + GFP_KERNEL); if (!new_keymap) return -ENOMEM; - memcpy(new_keymap, keymap, length * sizeof(struct key_entry)); keymap = new_keymap; return 0;