From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 BDF3F37F734 for ; Fri, 1 May 2026 23:44:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777679068; cv=none; b=IcTOvyAge8XxENeUlmgQirE6p+N/jtiR82o0EFfuWM0JSQJ2AsVmiBLKMVT+zGjTbNO6M633L0vBB4KRsI2V1NN58kksbs7dsdKyl5wrcCHBmF7CXj4OYZsN1X3VfHBqoFXUcGj46gfrgzFknWqkmV6AksEfMwKLXKJw1YkGDb4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777679068; c=relaxed/simple; bh=e3xY9BpPlg0ofQJ0cFdmVjNF8B/NwPas/F5ClkXZRzw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qJuAaL+RGOd+XbU3Fv+GlSpkBvGhbXWMv2WtuZ/wnEd/r/MaUxc99x5tfmIyXuRzO/Xw4K3vk2wOjZHMzYtpfwTBiYSG184inzBAC9AtPfk+aZn2s8O5W8UbdxS67gEvqihyHuxa/JP9QuxCYuzrggAyjfC7pRCGH5A5mrwRK2g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lOIOnENB; arc=none smtp.client-ip=209.85.216.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lOIOnENB" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-35d94f4ee36so1708794a91.3 for ; Fri, 01 May 2026 16:44:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777679067; x=1778283867; 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; bh=u2raLWGOHXV7U+bBCWk9otg1RvLIEFkuq+ZFzNDCnUU=; b=lOIOnENBHL+AUFO4Au6+sC9JjOqCa5on2YhNaEo2Uih/SuzzwXo0RS4tfAeYrOYhmf tro6mpFd+XwOYoFvwOJf67GoB8Nv9svk6+x9azTq4AbTQrlFUIohTlYxeEOzgpYWsZ7s XoSiYVgB8S4oTskzTuBljArdS4fWpuR6YS0UZNUfKUQr8LriKH3K7oPZ8iVC5N0kTF9K W1CT1JRxj/PQAVYhdLjDUzTAB8UnTXCfJAOnlKSW/UptG4dE0IlT8mDaBFoq0R7homF7 Egq0ejGeFDum9X0N4mzKcWfKwOa5/DH8EGCWSstEfVdgG6ZMZm0X3kcwHf6Ex1gClj+E Vl4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777679067; x=1778283867; 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; bh=u2raLWGOHXV7U+bBCWk9otg1RvLIEFkuq+ZFzNDCnUU=; b=Zgr/6KO6uNjiaoAE5xj1tssedLQqTA6au/qC7xwLYr3QLmxM/Eh/jCI76ZKNIv/ZcQ asLLAas26TdgLEh3v1Hb8iOCukmktVXsMVj/ZNDX1nOOELA/UDMtk4rHTgDZQiQwKpW/ 9ufN1qgFxtaNBeGtvduiX5UpEAZjjDJMcot64FslFKCQB9l/U1HGSNh1vS0/OEN0sIVO 9wcVbm4+YgAcjrcCh8IHJllJOzm8ODHxTeCegUujx/4BHwK4RS6Mo1DHF/ovpTZkqa24 QmXvzDlk3a5z7KaZSywtry8ShUBzgKS3RZUqQ32fvOO+JRbiSieJnIn8Uxua/x6hAMSS vK+Q== X-Forwarded-Encrypted: i=1; AFNElJ/MXEFXYN689pf6BH9+yKixDHXMLLYRiX+SqUVK7i6DQPZNFjD5uWnUlgacIZZDMzV3KyT2zzEN89em10Q=@vger.kernel.org X-Gm-Message-State: AOJu0YxZFsNdeNkBkzH60AF1XesZ+B8y9uTDVnLQzBOeIYjBEvC3oyYD ainbTOm9AAnDxdF8ZVKW5dXJhuJO491r97HjUeUubE06erW8SoBoogHS X-Gm-Gg: AeBDieseNTmopRn19NMwcyjTX+Lzj8/KPUwp4ZCLnLHmPPTZkoIk4Y/XH2zFskbHext T3fTNY5rCsCOMr7MPD82dO0OQkRDeAsJrbASieYC7lly3YyToUHfiYrKB3xaUXNBoB2EqWlkwMh +g6jPYKAsqg3MSAWf4tiGaax9EYRvx/jbo2GDDXl6UhwyV1T/GoCpkCl/qbpRxJjn3HG9kSkmez I3IRUTJYB/S5SOHDRNlOkGNi7wTQGZgEd/Ab5lkMY/Xamupbrx+mlh1DbGT1uLKEZPhpdTR/JKY w5wGvWuIQY7x2spgH3jXCRnNPECAsmKKdyriT2zbNa9h/1B1EBbZ6B4YfTWhsL+LOsrhzPvMabt h5tTdFHNR3VwP/FHdjHNva7U+87a/xkFDrk0cfjlHhLvhrWQp9NeEI4Jbr405GJp+EIG+BbaBcF AYN1zLXNaIffcQEA6wlrOiYA44V1auDA== X-Received: by 2002:a17:90b:580e:b0:364:534b:a898 with SMTP id 98e67ed59e1d1-3650cdfe2b3mr1282078a91.8.1777679067061; Fri, 01 May 2026 16:44:27 -0700 (PDT) Received: from localhost ([121.237.249.41]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364ec00a280sm3433586a91.10.2026.05.01.16.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 16:44:26 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: Andrew Morton , Sourabh Jain , Baoquan He , Dave Young , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Coiby Xu , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 4/9] crash_dump: Read the number of dm-crypt keys from reserved memory Date: Sat, 2 May 2026 07:43:33 +0800 Message-ID: <20260501234342.2518281-5-coiby.xu@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260501234342.2518281-1-coiby.xu@gmail.com> References: <20260501234342.2518281-1-coiby.xu@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In case user adds/deletes the keys by mistake, it's safer to read the number of keys from reserved memory. Fixes: 9ebfa8dcaea7 ("crash_dump: reuse saved dm crypt keys for CPU/memory hot-plugging") Reported-and-Suggested-by: Sourabh Jain Signed-off-by: Coiby Xu --- kernel/crash_dump_dm_crypt.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index 6377ee86ec50..a3e460714d23 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -88,21 +88,31 @@ static int get_keys_from_kdump_reserved_memory(void) { struct keys_header *keys_header_loaded; size_t keys_header_size; - - keys_header_size = get_keys_header_size(key_count); - keys_header = kzalloc(keys_header_size, GFP_KERNEL); - if (!keys_header) - return -ENOMEM; + int r = 0; arch_kexec_unprotect_crashkres(); keys_header_loaded = kmap_local_page(pfn_to_page( kexec_crash_image->dm_crypt_keys_addr >> PAGE_SHIFT)); + if (keys_header_loaded->total_keys <= 0 || + keys_header_loaded->total_keys > KEY_NUM_MAX) { + pr_warn("keys_header saved to reserved memory may be corrupt\n"); + r = -EINVAL; + goto kunmap; + } + + keys_header_size = get_keys_header_size(keys_header_loaded->total_keys); + keys_header = kzalloc(keys_header_size, GFP_KERNEL); + if (!keys_header) { + r = -ENOMEM; + goto kunmap; + } + memcpy(keys_header, keys_header_loaded, keys_header_size); +kunmap: kunmap_local(keys_header_loaded); arch_kexec_protect_crashkres(); - - return 0; + return r; } static int restore_dm_crypt_keys_to_thread_keyring(void) @@ -431,12 +441,12 @@ int crash_load_dm_crypt_keys(struct kimage *image) mutex_lock(&config_keys_subsys.su_mutex); - if (key_count <= 0) { - kexec_dprintk("No dm-crypt keys\n"); - return 0; - } - if (!is_dm_key_reused) { + if (key_count <= 0) { + kexec_dprintk("No dm-crypt keys\n"); + return 0; + } + r = build_keys_header(); if (r) goto out; @@ -447,7 +457,7 @@ int crash_load_dm_crypt_keys(struct kimage *image) * cleaned up at the end of kexec_file_load syscall */ kbuf.buffer = keys_header; - kbuf.bufsz = get_keys_header_size(key_count); + kbuf.bufsz = get_keys_header_size(keys_header->total_keys); kbuf.memsz = kbuf.bufsz; kbuf.buf_align = ELF_CORE_HEADER_ALIGN; -- 2.54.0