From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753444AbdK3Cgq (ORCPT ); Wed, 29 Nov 2017 21:36:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:52616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753028AbdK3CgJ (ORCPT ); Wed, 29 Nov 2017 21:36:09 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B2FF21992 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=mcgrof@kernel.org From: "Luis R. Rodriguez" To: jeyu@redhat.com, rusty@rustcorp.com.au Cc: keescook@chromium.org, tixxdz@gmail.com, mbenes@suse.cz, atomlin@redhat.com, pmladek@suse.com, hare@suse.com, james.l.morris@oracle.com, ebiederm@xmission.com, davem@davemloft.net, akpm@linux-foundation.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 1/3] module: use goto errors on check_modinfo() and layout_and_allocate() Date: Wed, 29 Nov 2017 18:36:03 -0800 Message-Id: <20171130023605.29568-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20171130023605.29568-1-mcgrof@kernel.org> References: <20171130023605.29568-1-mcgrof@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Although both routines don't have much complex errors paths we will expand on these routine in the future, setting up error lables now for both will make subsequent changes easier to review. This changes has no functional changes. Signed-off-by: Luis R. Rodriguez --- kernel/module.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 3e1c1e217e3f..bb595dc87651 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3037,12 +3037,14 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) err = check_modinfo_livepatch(mod, info); if (err) - return err; + goto err_out; /* Set up license info based on the info section */ set_license(mod, get_modinfo(info, "license")); return 0; +err_out: + return err; } static int find_module_sections(struct module *mod, struct load_info *info) @@ -3313,7 +3315,7 @@ static struct module *layout_and_allocate(struct load_info *info, int flags) err = module_frob_arch_sections(info->hdr, info->sechdrs, info->secstrings, mod); if (err < 0) - return ERR_PTR(err); + goto err_out; /* We will do a special allocation for per-cpu sections later. */ info->sechdrs[info->index.pcpu].sh_flags &= ~(unsigned long)SHF_ALLOC; @@ -3336,12 +3338,14 @@ static struct module *layout_and_allocate(struct load_info *info, int flags) /* Allocate and move to the final place */ err = move_module(mod, info); if (err) - return ERR_PTR(err); + goto err_out; /* Module has been copied to its final place now: return it. */ mod = (void *)info->sechdrs[info->index.mod].sh_addr; kmemleak_load_module(mod, info); return mod; +err_out: + return ERR_PTR(err); } /* mod is no longer valid after this! */ -- 2.15.0