From nobody Sun Feb 8 07:14:52 2026 Received: from smtpbgsg1.qq.com (smtpbgsg1.qq.com [54.254.200.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 315CE2EB5D4 for ; Tue, 16 Dec 2025 07:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=54.254.200.92 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765871809; cv=none; b=S0POUzW7kx5KVlcttFpQ+3rISK91FvVyORhTPPeV6TUpWXBbqp0k7QgIXUf2cTwNaZtfLvYLsUe69SgSdZgmnyGWT+/25eWrLCcoLfeBdaxw8Wkazs7ZAouoaU1cgl9g5d+9oI1QNiO2E5GMOxIVn1+DvjR9fzTK9vsxZwglZXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765871809; c=relaxed/simple; bh=h3jUr2NmHnVA9sK1J4u417UOBUVOniiW8d9v+Cbk/7E=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Rf4gIzARqqlCa085Gs8fnPuVKOkaLRruDFossPA9TG6R52LSzeLO/Scv6Mc7HL5fg654Rnr07QgCdTUFqPHPpcaZmz+2VlWALW1JTdRjknT1WPCbvTDUo4u3gPuOuDe9W7yDe5mZF8qIrb+oQsHE0zMPMvTplrZph8TxF1LYjXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=uniontech.com; spf=pass smtp.mailfrom=uniontech.com; dkim=pass (1024-bit key) header.d=uniontech.com header.i=@uniontech.com header.b=dGeKnEuu; arc=none smtp.client-ip=54.254.200.92 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=uniontech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=uniontech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=uniontech.com header.i=@uniontech.com header.b="dGeKnEuu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uniontech.com; s=onoh2408; t=1765871739; bh=nlC4H+HZu5TOOreu4OEbcwwZ6SLR8CCJXl93GTnllT4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=dGeKnEuuutmmStpt9Sl73pswPcxaTofKezDXddRgof9yU5f6nhwxuWlzwT50tU1io JvnQhPdkpdehQdXg5Hw7HI17E0jXxtWrwt4PddbNHe1c5c2e8dK2hRI4gxhKYQPwiL f+tG+SJ2XNYh8UgxOB/GCQiEtRsHmJYfAmRecU2w= X-QQ-mid: zesmtpsz6t1765871734tf0651cde X-QQ-Originating-IP: 6wjONADb7Dmiyy2GRLdVye8RdImTzi7oyW57IZANijM= Received: from localhost.localdomain ( [123.114.60.34]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 16 Dec 2025 15:55:32 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 1 X-BIZMAIL-ID: 11387274927920160015 EX-QQ-RecipientCnt: 5 From: Qiang Ma To: akpm@linux-foundation.org, bhe@redhat.com Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, Qiang Ma Subject: [PATCH v2] kexec: Replace the goto out_unlock with out Date: Tue, 16 Dec 2025 15:55:18 +0800 Message-Id: <20251216075518.1626114-1-maqianga@uniontech.com> X-Mailer: git-send-email 2.20.1 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 X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpsz:uniontech.com:qybglogicsvrsz:qybglogicsvrsz3b-0 X-QQ-XMAILINFO: NFNrK8KlcSCR9EA66xMf7tIj8cl/Y9r1WzmwQ3y/nVI6t7O3selnbLVH EpbusAwj9vdFDIlPuIvXG6t5BHxi1Gbnqq0jWHhZeVSwVZfxED9KfQo5c4yGc9RZ7t4q7A2 jjbHRPF9FXhgTmiXarcuieoLwKD84GvKRcFLCyM9yB/eRc4fibMuCQJlgYjHJ8u1v5Z7d44 RgiERkbhPHVIsgAayePQPClecF6A7DGwiPkjJUGUJzqIbHnBVd4m6R8BVP9ILME478QdFCl w+07FRaRZiW5k6GVA28BaHiU8iocQgSh+auvzh4nMAx9Giqr/pBi9ba/w6iToyNG+rCXN8E tLS40yn+KANKlX4BWSXCxqMIv6JntRGW8tL5C1IKndts0z54+kaqWIFa1bvp5rd9YwcOLPN ccOkFBvLWrwwC/Wa0yc8hq6rcv2TpGAjLEubysm6ycFXyMpAPF66BYrLunjk3EzU+2kP4j3 VQK+c5R8doHvInRzVwqCssSjHi7VoHGW47zO8c94q4LEesIOuJDSrL4Cql91y7+MPv2kL4F es5YZAmNunS/JGuQSbCSXB4YzO3CL4yb6RLETOAucz5JfbJYg0JNtjJjuxBGSmxrAF9Z240 LHlhbgpXf/WjSHyE1XP4RyhhM5FcqWzV6IR3mRqqeKbMwuIFSP4cHWyasmS0CpBlL4X99wz LhDg1D+ZPhNIRkLmbnaBU4W9FfpjYrcq0hbvrcvm2hK9DdnJt50qd+b2m6BWbdb4imySIal fFDVYDI6nu92jd1wuTFdOjHCxfQIChj02aJ1NX69g/73JluDNgsxtICKmY+td7CZNtAarwe HokHeOEpn5bU2I/LRR2GZpxTWMxBxhyTQdYuRJ8L5qV+B3eeEzzbI2TppSpqb52EFgLxbuh a70yXKotYr3RXdjd4z41pZauZdZJ6NDT+n+ZKvqNbwNGZG7ZC3fcwn9KlkuOXlgnDho0UgC 0K55b3pbm7XRggcgtFm8PFEcHJ967/QVjZhUUC5M+U0NNfatw+NQUnEA3LICK/bivM7ASGm ++3gUjpl0FvsNXPxVm7lurFm8HQgskTKOiwN3l7w== X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= X-QQ-RECHKSPAM: 0 Content-Type: text/plain; charset="utf-8" The image is initialized to NULL. Then, after calling kimage_alloc_init, we can directly goto 'out' because at this time, the kimage_free will determine whether image is a NULL pointer. This will prepare for the subsequent patch to reset the variable in kimage_free. Signed-off-by: Qiang Ma --- kernel/kexec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/kexec.c b/kernel/kexec.c index 28008e3d462e..9bb1f2b6b268 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -95,6 +95,8 @@ static int do_kexec_load(unsigned long entry, unsigned lo= ng nr_segments, unsigned long i; int ret; =20 + image =3D NULL; + /* * Because we write directly to the reserved memory region when loading * crash kernels we need a serialization here to prevent multiple crash @@ -129,7 +131,7 @@ static int do_kexec_load(unsigned long entry, unsigned = long nr_segments, =20 ret =3D kimage_alloc_init(&image, entry, nr_segments, segments, flags); if (ret) - goto out_unlock; + goto out; =20 if (flags & KEXEC_PRESERVE_CONTEXT) image->preserve_context =3D 1; --=20 2.20.1