From nobody Mon Sep 28 11:39:59 2026 Received: from canpmsgout05.his.huawei.com (canpmsgout05.his.huawei.com [113.46.200.220]) (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 C3BC63016F2 for ; Sat, 22 Aug 2026 06:43:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.220 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787380994; cv=none; b=aiof5P12cR1LZM87GvLQFLrFegxDJX6NQy88EiDGeeRGdt8rX0dg3KZJg5y0NyivWzGr0KRv2lDBd3nDpJRyPmYKxKTE9K7rAsThotK1GR4MI/XLbKdqjMo8HHJr9NPxL2JMfBLSlZUpk6DUaT9DC0iPLg2ToYehvgmm3vQShsw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787380994; c=relaxed/simple; bh=7iNABydM0HxEr0VOhYVbrDj5zIl2aDzkjWineRDuHjw=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=HGIVQOmRWIMLx3thSgRRzxesWewTOtSnpeNujDv26WU2/8cHIdXbbgDNOlpHL1dx4gQuRAusdJWKhmDHxR/vSLtf0Dv+8q7c7KgjuxUoigJUU8pMKIqzOkrpNM2IlkOT+mhKPvPPnTac9P3pal4r0GIriE9WZstywltKd54gzAQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=hYIe8WPm; arc=none smtp.client-ip=113.46.200.220 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="hYIe8WPm" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=6eacw4YePywUKJOL7QhFxdGGTcFFbEXg3nV8IglWfIA=; b=hYIe8WPmsGe8PIEm71LjWkodGMOUa9oyyhcsN2syDBuzunzkpnpzzS1RQ5wtKAkMAvHjIn5hZ aq0RtlP42KEZaIT8VKHjTtKGiKiIodz/0p/Ih/T3zfKozgcP3YQTkmnmtmpVcmcBdOhFZGjl+Tj ToKFI5d/w5hz/K+yKW1qgFI= Received: from mail.maildlp.com (unknown [172.19.163.0]) by canpmsgout05.his.huawei.com (SkyGuard) with ESMTPS id 4hRnRG1LPmz12LDV; Sat, 22 Aug 2026 14:32:42 +0800 (CST) Received: from kwepemo200009.china.huawei.com (unknown [7.202.195.26]) by mail.maildlp.com (Postfix) with ESMTPS id 9EDD140561; Sat, 22 Aug 2026 14:43:01 +0800 (CST) Received: from huawei.com (10.50.159.234) by kwepemo200009.china.huawei.com (7.202.195.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Sat, 22 Aug 2026 14:43:00 +0800 From: LongWei27 To: Alexander Graf , Mike Rapoport , Pasha Tatashin CC: Pratyush Yadav , , , , , Long Wei Subject: [PATCH] kho: Convert error handling to immediate return pattern Date: Sat, 22 Aug 2026 14:41:27 +0800 Message-ID: <20260822064127.498411-1-longwei27@huawei.com> X-Mailer: git-send-email 2.43.0 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-ClientProxiedBy: kwepems500001.china.huawei.com (7.221.188.70) To kwepemo200009.china.huawei.com (7.202.195.26) Content-Type: text/plain; charset="utf-8" From: Long Wei Replace the chained error accumulation (err |=3D func()) with immediate per-step error checking and early return in kho_out_fdt_setup(). Signed-off-by: Long Wei --- kernel/liveupdate/kexec_handover.c | 32 +++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_h= andover.c index 175c08a6e..93443ad84 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -1438,20 +1438,34 @@ static __init int kho_out_fdt_setup(void) int err; =20 err =3D fdt_create(root, PAGE_SIZE); - err |=3D fdt_finish_reservemap(root); - err |=3D fdt_begin_node(root, ""); - err |=3D fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE); + if (err) + return err; + err =3D fdt_finish_reservemap(root); + if (err) + return err; + err =3D fdt_begin_node(root, ""); + if (err) + return err; + err =3D fdt_property_string(root, "compatible", KHO_FDT_COMPATIBLE); + if (err) + return err; =20 preserved_mem_tree_pa =3D virt_to_phys(tree->root); =20 - err |=3D fdt_property(root, KHO_FDT_MEMORY_MAP_PROP_NAME, - &preserved_mem_tree_pa, - sizeof(preserved_mem_tree_pa)); + err =3D fdt_property(root, KHO_FDT_MEMORY_MAP_PROP_NAME, + &preserved_mem_tree_pa, + sizeof(preserved_mem_tree_pa)); + if (err) + return err; =20 - err |=3D fdt_end_node(root); - err |=3D fdt_finish(root); + err =3D fdt_end_node(root); + if (err) + return err; + err =3D fdt_finish(root); + if (err) + return err; =20 - return err; + return 0; } =20 static void __init kho_in_kexec_metadata(void) --=20 2.43.0