From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E36BC3F68F for ; Fri, 17 Jan 2020 15:04:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9772217F4 for ; Fri, 17 Jan 2020 15:03:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729106AbgAQPD7 (ORCPT ); Fri, 17 Jan 2020 10:03:59 -0500 Received: from mx2.suse.de ([195.135.220.15]:46182 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729073AbgAQPD6 (ORCPT ); Fri, 17 Jan 2020 10:03:58 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 10BA1BBAB; Fri, 17 Jan 2020 15:03:57 +0000 (UTC) From: Petr Mladek To: Jiri Kosina , Josh Poimboeuf , Miroslav Benes Cc: Joe Lawrence , Kamalesh Babulal , Nicolai Stange , live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek Subject: [POC 06/23] livepatch: Enable the livepatch submodule Date: Fri, 17 Jan 2020 16:03:06 +0100 Message-Id: <20200117150323.21801-7-pmladek@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200117150323.21801-1-pmladek@suse.com> References: <20200117150323.21801-1-pmladek@suse.com> Sender: live-patching-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: live-patching@vger.kernel.org The final step when loading livepatch module for livepatching a module is to actually enable the livepatch. The steps are exactly the same as in kmp_module_comming(). Note that there is no need to call klp_cleanup_module_patches_limited() in the error path. klp_add_object() modifies only the single matching struct klp_patch. Signed-off-by: Petr Mladek --- kernel/livepatch/core.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index 6c27b635e5a7..c21bd9ec2012 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -1011,6 +1011,28 @@ int klp_add_object(struct klp_object *obj) goto err_free; } + pr_notice("applying patch '%s' to loading module '%s'\n", + patch->obj->patch_name, obj->name); + + ret = klp_pre_patch_callback(obj); + if (ret) { + pr_warn("pre-patch callback failed for object '%s'\n", + obj->name); + goto err_free; + } + + ret = klp_patch_object(obj); + if (ret) { + pr_warn("failed to apply patch '%s' to module '%s' (%d)\n", + patch->obj->patch_name, obj->name, ret); + + klp_post_unpatch_callback(obj); + goto err_free; + } + + if (patch != klp_transition_patch) + klp_post_patch_callback(obj); + mutex_unlock(&klp_mutex); return 0; -- 2.16.4