From nobody Sat Sep 26 22:55:40 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A93DB36A004 for ; Fri, 28 Aug 2026 12:53:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787921599; cv=none; b=G6R9Gi/lL+NvsfI8c0pkSumutL6hhSpe+tda+82ooq+gpWAcGjWzPpHDx6tFC+EvtkBp4rmWOUqbzSAVMQxMbq0dQ92swdL6pVmNN1DrgGMUGFAldslmPViuPKSkzlDsbGbjnDdqorX8a3bmlNFKc163hBS2cVjD2lvTaPQWSH8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787921599; c=relaxed/simple; bh=V0ipTN+VU79Og/6q2/gAEwUlzAwaDu/FYOvOr67v5xs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L/h5xV1oOZyEQhbM/HAIJ3+Wobdjk6oWZwpK1g6W5HDlrPh4ikzv66kGv7o/X5MrWkJtXaTsYmvVwdfGncJ56WK2I5OgLqMg9wTNPOwHg0IuASerw+c2SKwC3EuvDPZMF/xEO0EtBZXhpwL9nFobvjKkAUcnBMZuGlGIZYCGixA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=QDiIl5d3; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="QDiIl5d3" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-4815bce4652so724035f8f.1 for ; Fri, 28 Aug 2026 05:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1787921596; x=1788526396; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=9uR95rA1nKl1NfVCak0CwmavJwAucCU+eKCmA3x7lsk=; b=QDiIl5d3rLxm2pd43bIh2D9mf/2Znq2xvaraH1J+WrDVfcNYCWbrAWEb1N15dQkjNK Ckq1wHhfK4PH6+JH/jrNJ6CgxQqYXvlUK4PBbLIPeAZfNa8pVKnMpIfb902H7EI74p9X EcxJC8NtBL9Gmxvc17Bw5YL6t4o0H9jhee9JKN21ensUw4riwDEAD3y3z7GjrVBVteoJ 1kORkmpO2B1bCkF7Hya9MH4DpV9FgulmP/SFkV1CDdqWiBhYzuFkOiHA0B/NWZ5nQ/94 O8yrhdTypZUo/1CMv/Tck/CEJpnaktOPydKZIQZhwpJK5Ngb0b03i8TWK6kDpb3C+toW Kb6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787921596; x=1788526396; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=9uR95rA1nKl1NfVCak0CwmavJwAucCU+eKCmA3x7lsk=; b=qDmTjCkp0Pd7fcFEPS1id1lXccLT/9w/Pz8rIJelI7XHOnlddiPLM5fQEkxcRebNkN wVDHs7EAe9IayaSIDH03DrtBB8kzIq1Zxb7ss0PVm+E1V//mscnuzV/rALHzyqQs9QRn bRUa4ucUNBHaKsL6fD56p4xjGeLEGuq2WMCfnwOD7zxrW48IltkK+o2ZHPm8tCg2DFt0 C9EoXK6gAqzDKXy5GL625+Ad10Hg3qZkih3vV1asrXJLiPRH6kbbyJBp9OlQn5kFYlQq uaDUIuV55uixIsP0WhMO3Ms1+6W0Tla+/WicdXm/RtMk7LSO2say++rW58JpL7JEnnTm qdug== X-Forwarded-Encrypted: i=1; AHgh+RpCa+CLpBQ5N/I66bgOCx7zobh7sgXh4uhYfuaDU5RN1p2zLI5P+EMN9BVmahMlBLGCv7yn89kHKish+3o=@vger.kernel.org X-Gm-Message-State: AFuF++lxLH127rB/rVUffNn3PRp1Psy6FUs5RY5LE8AV0sm0Mik0qEbz LF3058ZQIq1X/ZmYdetfcVlydLhwFyGNEdAccA5eNFqWyJ0LUoDDFZAo0y6ZnYYnKzQ= X-Gm-Gg: AR+sD13mU3vRIFLIwDidFReSljVGj5jR8wzl8ustovx2UHuEF7XvnDY8rO2rDvfuc34 Hew7BDVOBkn2LaUE5RAFyrSEoRrRF8XnPf2DTn/Do4dOau1IijWsTdYyXkRf5w0kz680RCVcPyP mOcbHyji1xoKr5BGv3ugHntnt3bUyAU7X3rVA7jWpt4jL4Z3cH8s9BRlrK/tuCLlD2OhwNWr+kG KbsQkC94Ija4UNtJOqGieL5gSdUfQtDkiNq5rOY+SPNjFFox3Daug+Ln0gbe6Sx99QKtgqnQtfB Pv04jYBiPQmtH42X6Hew59CW5tk1uW56zD1wUIldJIFp1giCEGzyn1Gf1l8eO5wpdEDsopd9ZSH d91dBkd4WWSPpoCeH02H1eqNFI4cIuaXpw8LwFCeELtXCZfI6nU/dk8OGBk27Pw6WNw6/U5PuXI CxFAjENZ+Z3gJV3onttovkfY92n2zTvQ1m8iwKnXeI6gA1/EN1YvG9wShza6CNsg== X-Received: by 2002:a05:600d:8449:b0:49b:96a0:5c00 with SMTP id 5b1f17b1804b1-49b96a05caemr58644285e9.13.1787921595899; Fri, 28 Aug 2026 05:53:15 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49b92695e52sm41405875e9.3.2026.08.28.05.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2026 05:53:15 -0700 (PDT) From: Petr Mladek To: Harry Hsu , jpoimboe@kernel.org, mbenes@suse.cz, joe.lawrence@redhat.com Cc: jikos@kernel.org, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH 1/2] livepatch: Move code for updating livepatch object relocations Date: Fri, 28 Aug 2026 14:52:43 +0200 Message-ID: <20260828125244.509977-2-pmladek@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260828125244.509977-1-pmladek@suse.com> References: <20260828125244.509977-1-pmladek@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" klp_free_object_loaded() is supposed to clear changes made by klp_init_object_loaded(). It should call klp_clear_object_relocs() which is currently defined later. Move the code for updating object relocations up. This is just a preparation step. No functional changes. Signed-off-by: Petr Mladek --- kernel/livepatch/core.c | 72 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index a3b377a3f47c..cdb25949f73b 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -342,6 +342,42 @@ int klp_apply_section_relocs(struct module *pmod, Elf_= Shdr *sechdrs, secndx, objname, true); } =20 +static int klp_write_object_relocs(struct klp_patch *patch, + struct klp_object *obj, + bool apply) +{ + int i, ret; + struct klp_modinfo *info =3D patch->mod->klp_info; + + for (i =3D 1; i < info->hdr.e_shnum; i++) { + Elf_Shdr *sec =3D info->sechdrs + i; + + if (!(sec->sh_flags & SHF_RELA_LIVEPATCH)) + continue; + + ret =3D klp_write_section_relocs(patch->mod, info->sechdrs, + info->secstrings, + patch->mod->core_kallsyms.strtab, + info->symndx, i, obj->name, apply); + if (ret) + return ret; + } + + return 0; +} + +static int klp_apply_object_relocs(struct klp_patch *patch, + struct klp_object *obj) +{ + return klp_write_object_relocs(patch, obj, true); +} + +static void klp_clear_object_relocs(struct klp_patch *patch, + struct klp_object *obj) +{ + klp_write_object_relocs(patch, obj, false); +} + /* * Sysfs Interface * @@ -823,42 +859,6 @@ static int klp_init_func(struct klp_object *obj, struc= t klp_func *func) func->old_sympos ? func->old_sympos : 1); } =20 -static int klp_write_object_relocs(struct klp_patch *patch, - struct klp_object *obj, - bool apply) -{ - int i, ret; - struct klp_modinfo *info =3D patch->mod->klp_info; - - for (i =3D 1; i < info->hdr.e_shnum; i++) { - Elf_Shdr *sec =3D info->sechdrs + i; - - if (!(sec->sh_flags & SHF_RELA_LIVEPATCH)) - continue; - - ret =3D klp_write_section_relocs(patch->mod, info->sechdrs, - info->secstrings, - patch->mod->core_kallsyms.strtab, - info->symndx, i, obj->name, apply); - if (ret) - return ret; - } - - return 0; -} - -static int klp_apply_object_relocs(struct klp_patch *patch, - struct klp_object *obj) -{ - return klp_write_object_relocs(patch, obj, true); -} - -static void klp_clear_object_relocs(struct klp_patch *patch, - struct klp_object *obj) -{ - klp_write_object_relocs(patch, obj, false); -} - /* parts of the initialization that is done only when the object is loaded= */ static int klp_init_object_loaded(struct klp_patch *patch, struct klp_object *obj) --=20 2.55.0 From nobody Sat Sep 26 22:55:40 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 876863C1F46 for ; Fri, 28 Aug 2026 12:53:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787921614; cv=none; b=orc4NKNMK2gd6CH2/v62efjtXUGQR7rPWKtBAmeT0zEcrU3VkXThASVtkLjhGUMQ0LX9Pa6+T2AUcCqwVEEVVuDtXAejQn0wJSPTRt2nFW3Ma/J9SfRPt9ysQryt0S9om6O2BT8e23z154pIe2DUU9apcW4MjahC9SKSGIvAN/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787921614; c=relaxed/simple; bh=Pb/gciTKGoofZUoKkdXhObAbA+m5MBrcbU+c7IppeHg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RSTAN71IPQ8GLeZXD8LZvLjk9y8KhnU32gQqSZdonddk9bJXrQVsprTUuCV5ybOMWztvfqPIMNWw9rskHOf8d0LsQbVQtkRuKzL+pfsERlaivHl8MSmvPMpAsYEeWXqc9ZPAwcio+vP5Coa3sOE9lxd8nV03xL0JMNLX8oUlweo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=X6POB/+Q; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="X6POB/+Q" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-482dd6ee390so805244f8f.3 for ; Fri, 28 Aug 2026 05:53:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1787921611; x=1788526411; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=QZ8dylnrUObvfw1K00N+19HMufBS4kkgfzkPvNd7cQA=; b=X6POB/+QAReYYOcjeyjpkT+yuKxs+2Srbeeuo3+cEKGWaV6vqdXeCkdLounMBu6N5V V8rZk/uO19hFNMPfwb6WK4oINmqAk4WdvMSvUVjnj2Bn+63r2BXt6davr3Mbl/d9S5sW zZwmuYgs9JvowjZxvymoXYmvRXtzS2rwCSZTsTPf/hreLvaQDj7UROeOtL++57roDR1V WyGuKNrzmgjYkuANXOWXw5TqbfN6W7u+Woaf2agC7lmYsVekqLKIwENFqFI+NjZ244fW ZHg5ghBWX0uzbVceo7/j2GJZu/WhpLAd+TF1UndBFXAQdBUgl5fFyvk06daT6zmLDGtN 68ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787921611; x=1788526411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=QZ8dylnrUObvfw1K00N+19HMufBS4kkgfzkPvNd7cQA=; b=PFRuTULggQ/F3D9Iaa//8EzlURN7yNFE2OMFikflbkue5oqxyNlWCVyNDRat7SCz0/ kwWmf9ksZo/jf7j2uCIbcPcFNH2so43nsSJM/3Ksl2Oa9nGjmLUYoakt5mA2el+aUTFB 6056wm5ZipFFsH+RGDzzLEBUmgIEi5eu0vliWGpU7RRlaPx0QSlw9kqi9MynSt1LJ2c8 KIEYine50rajJ92doIFbn2LAD+A3CIXxxVmH4XCHK0Tk2wKvS2hhLWkUzISdm2GH0G3t 37OS1kBZxtEseJC3myVv98gPNS6pUws4sSS+nMj/nCN4t9am/0rWqtyPIAwAMuLJsf+D wPLA== X-Forwarded-Encrypted: i=1; AHgh+Rrq0bk27/zWpZK3Qla0Gu2P+ssoTFt/8OG/5xA0uZL8x+UDCRbx+50LM9mTas64ydQbTGuTKkurPgvzHrY=@vger.kernel.org X-Gm-Message-State: AFuF++ngC4mLLFz2oAuTA0zjSqA8Uk6G6XyB0NlQOu0/9JEffObUE2ol xpB51Owc8thQScgR4wGw7/Xumour3xPqY4bGFgCiOucRLGlZz1pSxalIa1k3YiK04F4= X-Gm-Gg: AR+sD13IrvHS3P7W5l/3h9KGy+0PmFLfi5KosTz4EsOmN2Ym7AQ1m690+if5XB7SQPB 1m1oAsjxeGUwrlSWWeTRQMh2JU/LbXpDItXMMNInQm8r8HmzvYONGJkHTJaFFQL1a6vwhZlkUEm kjt/1jbFSrCLV+31zrpTsJKA++QZc5Im4uP5silWbYmbiAgJ2mf+SJqnExUcsNnrGEvf+uzbSxf DLdHqMlIYWuZisr3P4c07gXQxsIcm92bbDLZwyog314wPwCZ79BZW2zc5i9kO1ObswwYYc4uReN pt5tEX0ZNvi8i8PKsvLkh+2zrmhFCoGHizEmZu+pMeoBN2bMm3u8NwvasSSwmh0zpN9YKDoheUy 81hG1Hq2/lDQaZX8mbP5DvlwQGPMMKbvbkai9e6P3xwc+R3Sy9w0n6o+eOUNbVcNb/O2PmTgn6j uTtRt0iE0Ct89motvbXFCY2HeCFi8z9dW3w1QZfgt0HtOOHyObQE2dNbnA8mMD/g== X-Received: by 2002:a05:600c:3546:b0:499:dbc0:370d with SMTP id 5b1f17b1804b1-49b91c1dad9mr101978175e9.2.1787921610839; Fri, 28 Aug 2026 05:53:30 -0700 (PDT) Received: from pathway.suse.cz ([176.114.240.130]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49b92671c0esm39958905e9.2.2026.08.28.05.53.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Aug 2026 05:53:30 -0700 (PDT) From: Petr Mladek To: Harry Hsu , jpoimboe@kernel.org, mbenes@suse.cz, joe.lawrence@redhat.com Cc: jikos@kernel.org, live-patching@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Mladek , sashiko-bot@kernel.org Subject: [PATCH 2/2] livepatch: Clean up klp_init_object_loaded() when fails Date: Fri, 28 Aug 2026 14:52:44 +0200 Message-ID: <20260828125244.509977-3-pmladek@suse.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260828125244.509977-1-pmladek@suse.com> References: <20260828125244.509977-1-pmladek@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When a module is loaded, klp_module_coming() iterates over patches and calls klp_init_object_loaded(). If initialization fails, it delegates cleanup to klp_cleanup_module_patches_limited(). However, the cleanup loop skips the failing patch. Each function called in klp_init_object_loaded() is supposed to clean its own changes. This works except for the changes done by klp_init_object_loaded(). The current code is a bit messy. The changes done by klp_init_object_loaded() should get cleared by klp_free_object_loaded(). But this function also clears obj->mod which is set by klp_module_coming(). And relocations are cleared separately. Fix the situations by updating klp_free_object_loaded(). It should revert all and only changes made by klp_init_object_loaded(). This requires some shuffling: + Clear obj->mod explicitly in klp_cleanup_module_patches_limited() and do not rely on klp_free_object_loaded(). + Clear relocations in klp_free_object_loaded(). Remove the explicit call from klp_cleanup_module_patches_limited(). This requires adding the @patch parameter. Finally, call klp_free_object_loaded() in the error path in klp_init_object_loaded(). Reported-by: sashiko-bot@kernel.org Closes: https://lore.kernel.org/r/20260823062313.1321B1F000E9@smtp.kernel.o= rg Signed-off-by: Petr Mladek Acked-by: Song Liu --- kernel/livepatch/core.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c index cdb25949f73b..1e59a3cc0895 100644 --- a/kernel/livepatch/core.c +++ b/kernel/livepatch/core.c @@ -725,18 +725,20 @@ static void __klp_free_funcs(struct klp_object *obj, = bool nops_only) } =20 /* Clean up when a patched object is unloaded */ -static void klp_free_object_loaded(struct klp_object *obj) +static void klp_free_object_loaded(struct klp_patch *patch, + struct klp_object *obj) { struct klp_func *func; =20 - obj->mod =3D NULL; - klp_for_each_func(obj, func) { func->old_func =3D NULL; =20 if (func->nop) func->new_func =3D NULL; } + + if (klp_is_module(obj)) + klp_clear_object_relocs(patch, obj); } =20 static void __klp_free_objects(struct klp_patch *patch, bool nops_only) @@ -875,7 +877,7 @@ static int klp_init_object_loaded(struct klp_patch *pat= ch, */ ret =3D klp_apply_object_relocs(patch, obj); if (ret) - return ret; + goto err; } =20 klp_for_each_func(obj, func) { @@ -883,7 +885,7 @@ static int klp_init_object_loaded(struct klp_patch *pat= ch, func->old_sympos, (unsigned long *)&func->old_func); if (ret) - return ret; + goto err; =20 /* * Aliased symbols share one address, so they would resolve to @@ -896,7 +898,8 @@ static int klp_init_object_loaded(struct klp_patch *pat= ch, if (prev_func->old_func =3D=3D func->old_func) { pr_err("'%s' and '%s' resolve to the same address, aliased symbols are= not supported\n", prev_func->old_name, func->old_name); - return -EINVAL; + ret =3D -EINVAL; + goto err; } } =20 @@ -905,7 +908,8 @@ static int klp_init_object_loaded(struct klp_patch *pat= ch, if (!ret) { pr_err("kallsyms size lookup failed for '%s'\n", func->old_name); - return -ENOENT; + ret =3D -ENOENT; + goto err; } =20 if (func->nop) @@ -916,11 +920,17 @@ static int klp_init_object_loaded(struct klp_patch *p= atch, if (!ret) { pr_err("kallsyms size lookup failed for '%s' replacement\n", func->old_name); - return -ENOENT; + ret =3D -ENOENT; + goto err; } } =20 return 0; + +err: + klp_free_object_loaded(patch, obj); + + return ret; } =20 static int klp_init_object(struct klp_patch *patch, struct klp_object *obj) @@ -1274,8 +1284,8 @@ static void klp_cleanup_module_patches_limited(struct= module *mod, klp_unpatch_object(obj); =20 klp_post_unpatch_callback(obj); - klp_clear_object_relocs(patch, obj); - klp_free_object_loaded(obj); + klp_free_object_loaded(patch, obj); + obj->mod =3D NULL; break; } } --=20 2.55.0