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 v18 4/7] kexec: exclude elfcorehdr from the segment digest
Date:   Tue, 31 Jan 2023 17:42:33 -0500
Message-Id: <20230131224236.122805-5-eric.devolder@oracle.com>
In-Reply-To: <20230131224236.122805-1-eric.devolder@oracle.com>
References: <20230131224236.122805-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?eaYNtiSmc1vbEtzt/qZGHbBvQsrkVx9xciVX3CY5xFmgjaYySMciUGDKsP95?=
 =?us-ascii?Q?cGjvKqhwYtEgoGjCHq9aKKm0d1KvuiA6vr3bKFvCZWaCsxk5HrrP9Gp9Qi/I?=
 =?us-ascii?Q?XmhS6h7c5PWWUZARCfI8DWIDBl5FBhKlBN+J7l7HQH9c41lzqy4szz9socYR?=
 =?us-ascii?Q?Svyrttea/vEVoPplaNk/5xrlDwdp9S2Kf66Yq3ISF2IPm/zaBefHuQmpqpXc?=
 =?us-ascii?Q?hIWGDvrNzCSyffue3fNPlizI6D/oSLoaB1wEmwe4B5YfmV7vJElK2Jt9XdIa?=
 =?us-ascii?Q?6MzLzpjx4pnD5MA9sVLGdMhuo/6eC4o5wrYAssZaTJJFRjqFTqpnjC86E1zt?=
 =?us-ascii?Q?JgK+drFMK9s3fyYI61MS8msxL2vjZCitBJUVmCcv4BE3Ufjj1BzPBghcITP7?=
 =?us-ascii?Q?mIqM8H3GC9xiAgxejKxoxQ0Wg/L1tHUBL0R5XZ3J6ULYDaGxfeXM82fkoPBd?=
 =?us-ascii?Q?e+wok88HePyLsySaG6DN+FYxTwc1oXIg53zht43h/ZhfDXiilOaa+zs3/qVM?=
 =?us-ascii?Q?XU5qXQhIA3N86XkS4giWvMg7GlV5jp9JTnCZDpP69xa9hCahoBda/nABgJPV?=
 =?us-ascii?Q?SpSMWg4I0fn9poR6QXGI576Sm/zxqmVDF85X2VACBBsYFQjc/wzEcYRM3bpR?=
 =?us-ascii?Q?zIJ5lwk4RSfBfthA0OKDIpYHqNmEmIc0H1dTVYfp8Jkz51FuLnL8UxisPeYs?=
 =?us-ascii?Q?mnBINXPiyruTnf/xEKJeltpv7gwdzEbcRHMiLVurgWYX10j5C2xXbUZRdHOC?=
 =?us-ascii?Q?1OQqMc0Fd2IjeXIoiGWXcNFKe/h+MdU2Sx1R2G/LYaltIORCkAmSEay0EMX/?=
 =?us-ascii?Q?yoolNsc2rZKUC1d+IF6MDECuBigNJcKc3uM7UvQIAPGh3vSAIbMHD9FGdTWW?=
 =?us-ascii?Q?Z6G/Fsuggmw66OjZyBwDXGsRhC58P/Ly5vkymmuM9oPOnGi5fjaErj7oDm2m?=
 =?us-ascii?Q?/o74x9AvOEPkHh00by8FGGAuPt3Y1oJ5y8WooYVfqEjymwjRE5PapQEdw0g5?=
 =?us-ascii?Q?OLyuGuYfPpBiQM5sQzemn1dBuzAXN06A7e4RRo/yJ6VRNUlOmc7IrEpJy8mN?=
 =?us-ascii?Q?d466mLFedIKyff7SBIjzu0o/tDeHxQu12zqHivH/sDeN1pJjgzJJZSctIbab?=
 =?us-ascii?Q?/w1pnKyBlGdZni/9WWHURPb+lYdbgo6sh8sqPhUYQCnAzG06hx0o/Sk18Knm?=
 =?us-ascii?Q?NH/lc1HzaineWZ1mGgkdJl2Inntn7RkhRM4qRZFKXmVNH5zJOeDj53QItFiW?=
 =?us-ascii?Q?t7GRq68rIhP1AhZ/2CpXlAPf6YvxZQdXjmlESFsCaPLydWToEWVRvlW2c/90?=
 =?us-ascii?Q?PvW+KP/5fNKezeW1yQ+RiP7oAPYEatGuRutaI+x6WDoOWLZN/4lE3xBP7QmR?=
 =?us-ascii?Q?lhy7QW9GfWEGpHSaNGttZfUt5Y0ACEAevTT4mwxmiK0rl2UqnJugojZpi+Li?=
 =?us-ascii?Q?cnIRH7onLiSjo1l8hRRdJPHV4WWXsx2RWOlbW4btbIQZSoBenAgO2/w80q2l?=
 =?us-ascii?Q?EnAaSIw62k1vxCadV3a0T7aocDKTiYJeRPMgo+f8cmfaR/tXDsRZdBNVIsMP?=
 =?us-ascii?Q?CANZscFf4doZLgcpYgZFgR+g+3XTazQ3Lnc/MGF5ELz6bi0ft5B7MXwQncMz?=
 =?us-ascii?Q?IA=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?ky1ShiU6YHTBnI6furvJ9miVslXC9XgW5xUviPPPSlqghlGUU9ggdZehDU+b?=
 =?us-ascii?Q?iDbEqGdy/HaMgL9xJk4jjiOdqr0CTL++5J00DKpkxeLDdeH5jTujZBHAlMvQ?=
 =?us-ascii?Q?7FNL+8yDHXXdZLqEZDerjUb0kggbiy+2H4fJL84nRQsVwNL6iz2HstNslqK4?=
 =?us-ascii?Q?SFpO2C/3TCQIYpJMVgYAufAHAoKvLKPBJdWc+GCCCLote7/HSyPJuQvhe6fc?=
 =?us-ascii?Q?3i727tWZ1WyVwNp1DRCEISrWfzcEqdTm21koW04eRI6vF3Zzx2mzJblRPZfR?=
 =?us-ascii?Q?Ydwafg801d+6hp1+ydu1DAVMyZhcse4lw1R1UyzwZcOP6HbTz7dErojWEbKe?=
 =?us-ascii?Q?5XVYl1ba2/crE87VuvPIg4/39Y/A2Gpr/woX8dhqzgWwg0zQs8VUMH9YCZCh?=
 =?us-ascii?Q?z5JvKNcepwXgI3PIykmVLuQeDGp0yTyQR6NB7gjsOgBDS6okqoKA7qI6xFvW?=
 =?us-ascii?Q?xPdMSCPOLQIjF/kYVlFr0GdOzaD9HxtIxyH6YuMFYDw1Q/+NK9Qkcn4FGNPO?=
 =?us-ascii?Q?4qleceF0MzCPajWjQpNBQGCSCDr8lb21d3hQAhURLru7QZRUJYw69Gi10KQK?=
 =?us-ascii?Q?OeIYQOh0LHAGtXjm1HfkBgExCkSk76ekJSQ+KvDbPlhCJzS7whpRzR0u3IcZ?=
 =?us-ascii?Q?KMNqCCdXDLn6DUcmyFvxFQL0wNBFdIdvFEJwlzVxnu8cft6VlFBA2DxXvIsb?=
 =?us-ascii?Q?8/yQviFpSh63td4DCBbZBp7B4v75eKTvFRzKXzBSrWhdFIkcD3poPSkzWusv?=
 =?us-ascii?Q?194x5D+P7MmvQ3DCgm+FpZivNyKyckt931MYKxSKGfI2lteNG8pgoWs75sIh?=
 =?us-ascii?Q?QYucfTSqx+JGBQdAvfLUwuFteyEQCnJXKqDRrYxE3gywwGlMy05pLULFIsea?=
 =?us-ascii?Q?yxjXPwwSpBeTjQ+FSF+4xsMEICNaQX10rv/gOBFguLwTPxKMm8oqcCCtip0W?=
 =?us-ascii?Q?Kk1876WgsrlQIkSko/zx1+gT0gqOt/k+J1lgOQj/tjlZruejnRqw5xER3fSw?=
 =?us-ascii?Q?CmoFnSfyGkxrZ1aPPyr+VoVI4Sc9jkx87Ec6VEoiuQTlcfk/ZpNzjXEhhIOi?=
 =?us-ascii?Q?LLn0dMtvpTeaDSRyT6nC461hi1w28H/ACmKfpzgJfG8Fe1g6iv+5NJLuhvoA?=
 =?us-ascii?Q?yF+saUDPHWznTnw1jcHUuHN3O1wih6hfS37brOYQHlmhUv8UOBYsHsU=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 65c18717-4ed4-430d-e3ef-08db03dc7f51
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 22:42:56.9162
 (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: J+cq4pzgVAqjFWK6wGV+Hp23H3xfIvfPgX41d+8TgL9qof3+5otfc/D8rG90qtLqqZqwLynquCz/dsatjwgOmBQ+RoR/ZSQLE9F7h3XGhGE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4647
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1
 definitions=2023-01-31_08,2023-01-31_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0
 adultscore=0 bulkscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000
 definitions=main-2301310196
X-Proofpoint-GUID: KUBSU5FZOglZrqNta8C2HSXJlObsRoLf
X-Proofpoint-ORIG-GUID: KUBSU5FZOglZrqNta8C2HSXJlObsRoLf
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.

This patchset updates the elfcorehdr on CPU or memory changes.
However, changes to the elfcorehdr in turn cause purgatory
integrity checking to fail (at crash time, and no vmcore created).
Therefore, this patch explicitly excludes the elfcorehdr segment
from the list of segments used to create the digest. By doing so,
this permits updates to the elfcorehdr in response to CPU or memory
changes, and avoids the need to also recompute the hash digest and
reload purgatory.

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 ead3443e7f9d..2f3b20b52e5d 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;
 
+#ifdef CONFIG_CRASH_HOTPLUG
+		/* Exclude elfcorehdr segment to allow future changes via hotplug */
+		if (image->elfcorehdr_index_valid && (j == image->elfcorehdr_index))
+			continue;
+#endif
+
 		ksegment = &image->segment[i];
 		/*
 		 * Skip purgatory as it will be modified once we put digest
-- 
2.31.1