From patchwork Sat May 22 08:21:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 101606 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 o4M8O0rn024700 for ; Sat, 22 May 2010 08:24:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753726Ab0EVIVe (ORCPT ); Sat, 22 May 2010 04:21:34 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:60329 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753417Ab0EVIVc (ORCPT ); Sat, 22 May 2010 04:21:32 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw1.diku.dk (Postfix) with ESMTP id 2467C52C5E1; Sat, 22 May 2010 10:21:32 +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 Gq9Yn4pGwPak; Sat, 22 May 2010 10:21:27 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw1.diku.dk (Postfix) with ESMTP id 7BB1352C5D6; Sat, 22 May 2010 10:21:27 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id 7D22B6DFBAF; Sat, 22 May 2010 10:14:07 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 60233200BD; Sat, 22 May 2010 10:21:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 55DC1200BB; Sat, 22 May 2010 10:21:27 +0200 (CEST) Date: Sat, 22 May 2010 10:21:27 +0200 (CEST) From: Julia Lawall To: Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 10/27] drivers/infiniband/core: Use memdup_user Message-ID: MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@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, 22 May 2010 08:24:00 +0000 (UTC) diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 4647484..08f948d 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c @@ -706,14 +706,9 @@ static int ib_ucm_alloc_data(const void **dest, u64 src, u32 len) if (!len) return 0; - data = kmalloc(len, GFP_KERNEL); - if (!data) - return -ENOMEM; - - if (copy_from_user(data, (void __user *)(unsigned long)src, len)) { - kfree(data); - return -EFAULT; - } + data = memdup_user((void __user *)(unsigned long)src, len); + if (IS_ERR(data)) + return PTR_ERR(data); *dest = data; return 0;