Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Eric DeVolder <eric.devolder@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com
Cc:     tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
        dave.hansen@linux.intel.com, hpa@zytor.com,
        nramas@linux.microsoft.com, thomas.lendacky@amd.com,
        robh@kernel.org, efault@gmx.de, rppt@kernel.org, david@redhat.com,
        sourabhjain@linux.ibm.com, konrad.wilk@oracle.com,
        boris.ostrovsky@oracle.com, eric.devolder@oracle.com
Subject: [PATCH v13 4/7] kexec: exclude elfcorehdr from the segment digest
Date:   Mon, 31 Oct 2022 15:36:01 -0400
Message-Id: <20221031193604.28779-5-eric.devolder@oracle.com>
In-Reply-To: <20221031193604.28779-1-eric.devolder@oracle.com>
References: <20221031193604.28779-1-eric.devolder@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eTWiOkdi6Z91f32Kku7E7kIf3655dWJ6eJKt+nUS2FBXom11PO8aeSjkFeo3?=
 =?us-ascii?Q?QAOeT6NhZlwS1I6pB+4/EfMJ2O9Fmb19izXSX5TcEPGKjgRIRXFNr7Ev+fE+?=
 =?us-ascii?Q?MtQ+21NEGqDtP4lfeOxN5YR80tmAxO00+z6eKC+ojj2f1xpKNVdK0vi9OKh2?=
 =?us-ascii?Q?ixoPEGgZVak15bAi7NZw+mbjQlc45lFLK+prZ35+tMfXWKyooq9xXmTST36k?=
 =?us-ascii?Q?b6aM7OctkaK1BAwhumAzK+wHcVVBxOWQYHl1CD21pUh7u3CLmvhUt31b2wd1?=
 =?us-ascii?Q?nLBwJhQrj6t00oOi4UUeVpXHHN3jVAIVoFKLUZUILXLOVbg+lZOO0pJ1yFam?=
 =?us-ascii?Q?hzyGLxpW/XhohhSMsnPFF5QUd0H0jOtdATwP6hPhTaWo6HToh+euQJk+m1dS?=
 =?us-ascii?Q?q5dzPJwRRMryUJ6VjVnCK+ghiH5HKmFWZoTPjzhI1mV4jnStXOQjtcFm2PLg?=
 =?us-ascii?Q?6yG5bmARiJXL2GWuj6s9Tn36/U1nHvWFoqRQujoa2Bg7UXKcPzkkmkM4kZTA?=
 =?us-ascii?Q?3JbT4F0skGE/btPQ1bNOaduVHMOEkzmJkI/vd0iJ8yaa+Kc0wkHZvksG8Q3x?=
 =?us-ascii?Q?84D7wpkSUTmNgiVYbhiBpplJXYwno8+tajufbUHsKSsTlKm90nwf3/UAsv7+?=
 =?us-ascii?Q?krmaDEMja5VaUubZxoUDxX5nThDza6sXNoJZqDVLA6aBDl8obQefsyNAS/D1?=
 =?us-ascii?Q?KWR0oi7gY8Yq/F8BvE4eTrb3n/95kJIqI/sENu0UcyzI2Jr5cUlOxgpOuzKv?=
 =?us-ascii?Q?gbs6nK1ZQ/IfkSNuTcICRuusB1IrMq68O25EUcYwsHwHae+h6FAB8LtCDf/1?=
 =?us-ascii?Q?U0owS1D7tgU71YTUo+E9ctVfFk6oI6m/Livi9O4yomaYHuNq3p/wNHvcdQ5O?=
 =?us-ascii?Q?gfpFfzDHh7LboR6vWfkIO+c/2KEsEuPAhMnb+ewppqfwMNnGOVDPpbE5i2jC?=
 =?us-ascii?Q?0uVJL04JocMOjklVjTVvm+5ZpoCcekY+f6ZYC9grRBIEvD898568Uun1Uqc0?=
 =?us-ascii?Q?e1Z6oBm4ChX9uq8Kiy3yAZolxOwyUEdag4VIr25iBqod9ocpzrmrWEfKG0LB?=
 =?us-ascii?Q?JYXdqEoRCbYPSg3hpxSgOS8fKl+SPtlkufYSxW8Vy7/GyMagDKUITEU9XHJX?=
 =?us-ascii?Q?UG9nFMrIdeOUOiBs5Xy4GbyHqf9sRwXvmVXpADfu0QJV2fY0K+mUkabk1nxJ?=
 =?us-ascii?Q?HLwlfkz+OPhsFLAOcR8u9iGkp31u3E2fnBZ91SajF57NmbQtTXzrDuWr7iU2?=
 =?us-ascii?Q?wd3RyTtfQl9KwK7L7VOFQ8djCC2jXyOWngkiqkApM8oQkoRSyddHZuFBR9EA?=
 =?us-ascii?Q?LZ/54kj+RzmwESx648gI3ppjL1BInSy9LlAW+Nyy9e/qaYV5b5y3plol4hp4?=
 =?us-ascii?Q?pgUBU0/8ePQkw9zqVAej9DN+yS3mVgOWJVlJMgsQ8VSC1Qb6UAIuSCFoEYGV?=
 =?us-ascii?Q?KDUD3TUTNMkyBKoAIiGVDH6Ek8wwoZTzeiQHwNIRue8y0n93WiYLBHSm2PGj?=
 =?us-ascii?Q?+ms7zkJFCuYxqSYgg/TJ4nXDvbBxzteDXixOJ2wAXy4vOrKY9RsqRU53b6w8?=
 =?us-ascii?Q?noQia3selfYQiDVTQKc+U2VLhKRgv3sTpqUusCvCTwRJVuG51Vum4YlDEj6I?=
 =?us-ascii?Q?fg=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9f686fc6-37df-4ea6-fa45-08dabb77310c
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Oct 2022 19:36:22.7271
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: iMR4y52lrXdheuiNaEfgl0jABkHwEneeYbiHGSWQK/Mqk7zQ0UWDnUGddHHk7mVDgBfrOEYx5uM7628hB06EvTfLhdZTKaE8mwbQfQopIqc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4228
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-31_20,2022-10-31_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 spamscore=0 bulkscore=0
 suspectscore=0 phishscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000
 definitions=main-2210310121
X-Proofpoint-ORIG-GUID: H_eQ0N7lDN9fwgbf_ensSii7eJ15xs8B
X-Proofpoint-GUID: H_eQ0N7lDN9fwgbf_ensSii7eJ15xs8B
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

When a crash kernel is loaded via the kexec_file_load() syscall, the
kernel places the various segments (ie crash kernel, crash initrd,
boot_params, elfcorehdr, purgatory, etc) in memory. For those
architectures that utilize purgatory, a hash digest of the segments
is calculated for integrity checking. This digest is embedded into
the purgatory image prior to placing purgatory in memory.

Since hotplug events cause changes to the elfcorehdr, purgatory
integrity checking fails (at crash time, and no kdump created).
As a result, this change explicitly excludes the elfcorehdr segment
from the list of segments used to create the digest. By doing so,
this permits changes to the elfcorehdr in response to hotplug events,
without having to also reload purgatory due to the change to the
digest.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
Acked-by: Baoquan He <bhe@redhat.com>
---
 kernel/kexec_file.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index f98d1742872b..4d3451cf9f0c 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -723,6 +723,12 @@ static int kexec_calculate_store_digests(struct kimage *image)
 	for (j = i = 0; i < image->nr_segments; i++) {
 		struct kexec_segment *ksegment;
 
+		if (IS_ENABLED(CONFIG_HOTPLUG_CPU) || IS_ENABLED(CONFIG_MEMORY_HOTPLUG)) {
+			/* Exclude elfcorehdr segment to allow future changes via hotplug */
+			if (image->elfcorehdr_index_valid && (j == image->elfcorehdr_index))
+				continue;
+		}
+
 		ksegment = &image->segment[i];
 		/*
 		 * Skip purgatory as it will be modified once we put digest
-- 
2.31.1