Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754813AbcKJJwk (ORCPT ); Thu, 10 Nov 2016 04:52:40 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:50453 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754494AbcKJJwi (ORCPT ); Thu, 10 Nov 2016 04:52:38 -0500 X-AuditID: cbfee61a-f79916d0000062de-84-582443640c9f From: Shailendra Verma To: Gleb Natapov , Paolo Bonzini , kvm@vger.kernel.org, Shailendra Verma , Shailendra Verma Cc: linux-kernel@vger.kernel.org, vidushi.koul@samsung.com Subject: [PATCH] Virt: Kvm - Improvement in code readability when Date: Thu, 10 Nov 2016 15:20:02 +0530 Message-id: <1478771402-1163-1-git-send-email-shailendra.v@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t9jQd0UZ5UIgy1rFCy+/LzOaDFnaqHF 5V1z2Cz2b/vHanFr3kw2i0XfXjFb/L14ic2B3WPnrLvsHptWdbJ5vN93lc2jb8sqRo/Pm+QC WKPcbDJSE1NSixRS85LzUzLz0m2VQkPcdC2UFPISc1NtlSJ0fUOClBTKEnNKgTwjAzTg4Bzg Hqykb5fglrH76H7Gglk8FUfPvmdqYLzD2cXIySEhYCKxY8YxZghbTOLCvfVsXYxcHEICsxgl LnW9YodwfjJKrLy6mAWkik3AUOJ1318mkISIwAFGiRM7XzOBJJgFrCQm/Z/NCmILCzhK7Nl6 H2wsi4CqxM89y8GaeQXcJZ7cfw5kcwCtU5CYM8lmAiP3AkaGVYwSqQXJBcVJ6bmGeanlesWJ ucWleel6yfm5mxjBIfpMagfjwV3uhxgFOBiVeHg7NJUjhFgTy4orcw8xSnAwK4nwqjqqRAjx piRWVqUW5ccXleakFh9iNAXaP5FZSjQ5Hxg/eSXxhibmJubGBhbmlpYmRkrivI2zn4ULCaQn lqRmp6YWpBbB9DFxcEo1MJ7c9uth7YXIwv0v4pQXTxCbsr1v8veja/g1y95wutlbHN1YyPRP XevSz9bY5z+9TebEqJxqDc//6izz4qzL97BnmtdMPmzxk50fV9kUNSX5rO/jrw9MzSeuL1hc pi63rjau4GTgNL3WCT+mVO7NqWSdvcFeW+rMrD09K/cx2+2dc8FS8WTQ23tKLMUZiYZazEXF iQByVErAZwIAAA== X-MTR: 20000000000000000@CPGS Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1509 Lines: 51 From: "Shailendra Verma" 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: Shailendra Verma --- virt/kvm/kvm_main.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2907b7b..45e0af4 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2581,8 +2581,8 @@ static long kvm_vcpu_ioctl(struct file *filp, r = -ENOMEM; kvm_regs = memdup_user(argp, sizeof(*kvm_regs)); if (IS_ERR(kvm_regs)) { - r = PTR_ERR(kvm_regs); - goto out; + vcpu_put(vcpu); + return PTR_ERR(kvm_regs); } r = kvm_arch_vcpu_ioctl_set_regs(vcpu, kvm_regs); kfree(kvm_regs); @@ -2605,9 +2605,8 @@ static long kvm_vcpu_ioctl(struct file *filp, case KVM_SET_SREGS: { kvm_sregs = memdup_user(argp, sizeof(*kvm_sregs)); if (IS_ERR(kvm_sregs)) { - r = PTR_ERR(kvm_sregs); - kvm_sregs = NULL; - goto out; + vcpu_put(vcpu); + return PTR_ERR(kvm_sregs); } r = kvm_arch_vcpu_ioctl_set_sregs(vcpu, kvm_sregs); break; @@ -2697,9 +2696,8 @@ static long kvm_vcpu_ioctl(struct file *filp, case KVM_SET_FPU: { fpu = memdup_user(argp, sizeof(*fpu)); if (IS_ERR(fpu)) { - r = PTR_ERR(fpu); - fpu = NULL; - goto out; + vcpu_put(vcpu); + return PTR_ERR(fpu); } r = kvm_arch_vcpu_ioctl_set_fpu(vcpu, fpu); break; -- 1.7.9.5