From patchwork Fri Nov 11 09:02:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Shukla X-Patchwork-Id: 9422621 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 521476047D for ; Fri, 11 Nov 2016 09:05:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 468AB29951 for ; Fri, 11 Nov 2016 09:05:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AAC42997F; Fri, 11 Nov 2016 09:05:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D791D29951 for ; Fri, 11 Nov 2016 09:05:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935633AbcKKJEy (ORCPT ); Fri, 11 Nov 2016 04:04:54 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:45895 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755532AbcKKJEt (ORCPT ); Fri, 11 Nov 2016 04:04:49 -0500 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGG00Z78ZVXQK40@mailout4.samsung.com>; Fri, 11 Nov 2016 18:04:45 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-e3-582589adb4bf Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 03.DE.25310.DA985285; Fri, 11 Nov 2016 18:04:45 +0900 (KST) Received: from localhost.localdomain ([107.108.168.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGG00JAEZVIDS00@mmp1.samsung.com>; Fri, 11 Nov 2016 18:04:45 +0900 (KST) From: Sachin Shukla To: Alexander Viro , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, sachiniiitm@gmail.com Cc: ravikant.s2@samsung.com, p.shailesh@samsung.com, ashish.kalra@samsung.com, vidushi.koul@samsung.com Subject: [PATCH] Fs: Improvement in code readability when memdup_user()fails. Date: Fri, 11 Nov 2016 14:32:24 +0530 Message-id: <1478854944-25969-1-git-send-email-sachin.s5@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t9jAd21naoRBm1LLCzuT/vGbrFn70kW i8u75rBZ7JjSymLR1DCb3eLBornMFn8vXmKzOP/3OKsDh8fOWXfZPfq2rGL0+LxJzmPTk7dM ASxRbjYZqYkpqUUKqXnJ+SmZeem2SqEhbroWSgp5ibmptkoRur4hQUoKZYk5pUCekQEacHAO cA9W0rdLcMs43PeXsWAxW8We3pmMDYxNrF2MnBwSAiYSyy4tYYKwxSQu3FvP1sXIxSEksJRR Yk3jS0YI5yejxIM/bxhBqtgEtCU+9M9nAUmICDQxSkzd9RDI4eBgFsiUaGmoADGFBXwlJv4Q ASlnEVCV2NXxlxnE5hVwlZi1tIEZpERCQEFiziSbCYzcCxgZVjFKpBYkFxQnpeca5qWW6xUn 5haX5qXrJefnbmIEB+gzqR2MB3e5H2IU4GBU4uGVyFKNEGJNLCuuzD3EKMHBrCTC29IKFOJN SaysSi3Kjy8qzUktPsRoCrR/IrOUaHI+MHrySuINTcxNzI0NLMwtLU2MlMR5G2c/CxcSSE8s Sc1OTS1ILYLpY+LglGpg3PiQdbXhqWMyE1y9GMScSts29p4tLLgXHfnf8pBDTjzjjCszFj6w ZjWc2qg88ULOrFr1DWyXP910fyn7ytxyb4y05iPvDbPeFX4Ok3OY56djcTP9RSnjCpWEqbJ5 BhtkRSW/fWLVbai8/CuLg2FBocxNr0f7LRU2P3naeviW35PC71sl7yZIK7EUZyQaajEXFScC AJDPAJVmAgAA X-MTR: 20000000000000000@CPGS Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Sachin Shukla" There is no need to call kfree() if memdup_user() fails, as no memory was allocated and the error in the error-valued pointer should be returned. Signed-off-by: Sachin Shukla --- fs/ioctl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/ioctl.c b/fs/ioctl.c index c415668..1103c5d 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -588,11 +588,8 @@ static int ioctl_file_dedupe_range(struct file *file, void __user *arg) } same = memdup_user(argp, size); - if (IS_ERR(same)) { - ret = PTR_ERR(same); - same = NULL; - goto out; - } + if (IS_ERR(same)) + return PTR_ERR(same); same->dest_count = count; ret = vfs_dedupe_file_range(file, same);