From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965950AbcBDO4o (ORCPT ); Thu, 4 Feb 2016 09:56:44 -0500 Received: from smtprelay0181.hostedemail.com ([216.40.44.181]:36591 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965231AbcBDO4m (ORCPT ); Thu, 4 Feb 2016 09:56:42 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2693:2897:3138:3139:3140:3141:3142:3352:3622:3865:3867:3868:3870:3872:3873:3874:5007:6261:7875:8660:10004:10400:10848:10967:11026:11232:11658:11914:12296:12438:12517:12519:12740:13069:13148:13230:13311:13357:14096:14097:14659:21080:30012:30054:30075:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: egg00_746002e262532 X-Filterd-Recvd-Size: 2343 Date: Thu, 4 Feb 2016 09:56:38 -0500 From: Steven Rostedt To: Petr Mladek Cc: Jessica Yu , Josh Poimboeuf , Seth Jennings , Jiri Kosina , Vojtech Pavlik , Miroslav Benes , Rusty Russell , Ingo Molnar , live-patching@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/2] livepatch/module: remove livepatch module notifier Message-ID: <20160204095638.2834778c@gandalf.local.home> In-Reply-To: <20160204143934.GZ3305@pathway.suse.cz> References: <1454375856-27757-1-git-send-email-jeyu@redhat.com> <1454375856-27757-3-git-send-email-jeyu@redhat.com> <20160204143934.GZ3305@pathway.suse.cz> X-Mailer: Claws Mail 3.13.1 (GTK+ 2.24.29; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 4 Feb 2016 15:39:35 +0100 Petr Mladek wrote: > > @@ -3375,6 +3378,10 @@ static int complete_formation(struct module *mod, struct load_info *info) > > mutex_unlock(&module_mutex); > > > > ftrace_module_enable(mod); > > + err = klp_module_enable(mod); > > + if (err) > > + goto out; > > If you go out here, you need to revert some some operations > that are normally done in the bug_cleanup: goto target > in load_module(). In particular, you need to do: > > /* module_bug_cleanup needs module_mutex protection */ > mutex_lock(&module_mutex); > module_bug_cleanup(mod); > mutex_unlock(&module_mutex); > > ftrace_release_mod(mod); > > /* we can't deallocate the module until we clear memory protection */ > module_disable_ro(mod); > module_disable_nx(mod); > > > IMHO, it would make sense to somehow split the complete_formation() function > and avoid a code duplication in the error paths. If complete_formation() fails, load_module will do a goto ddebug_cleanup, which will eventually call ftrace_release_mod(). No need to do it here. -- Steve