From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 6416938AC83 for ; Wed, 29 Jul 2026 03:37:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785296227; cv=none; b=PFn57kAGvTB0Ue7ZlU0UAEctEThH7AZoZu0A3kEqluGfpqtye3yO9Vo7HlS9o1x4BLIwVtZwRL6Z0GNC9rwC09NjvsMl+PtHwvayg+JqSN01T+KXJVnwDHrfa0J/4bmgv1mIaCmYuD+c0qDiXVWpXJpvzZ6VQdfdXKmrzc1e6N4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785296227; c=relaxed/simple; bh=Zfg8Jh0VBZ03/dAIsEwQ4T1HqeEH8CK1kSKYgckvZEE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iQs47XIFXwnHMNQatJbmtveWtziDlcbanNTLLktNNQZQIYc+k0rONZIaPtI++Pp3lqso866WShExJ+fxwpwB94TQK3YqNHLPulMUV/xlVeuWB+4Jnb3A8Gi1kkZ0NASUaroe9/RTnbrnTNscXVMe8LTRVktjYWR5ytaB7bGlyRc= 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=FAxj1yL7; arc=none smtp.client-ip=209.85.214.182 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="FAxj1yL7" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2ceaf8a1265so6222635ad.2 for ; Tue, 28 Jul 2026 20:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785296226; x=1785901026; 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:content-type; bh=tu5Y2pXtD7EYXho8m2Td0vTpaq76oKkvCI7opHYUzCY=; b=FAxj1yL7/fs8KqEugsb4hcHSIxQPrYw+bDdwUG3WkWzoKWJvv4b3SXwtlvw/ZwAY9h YLwRy89ddRd346ryYN6A2GcQI3DvSDMOLNmah2eUqDPsiPlj+XbO4HiV19e8zOQkSHi6 DzR92Yx/EOa9VaC7UYeab1Hn10SxxJHsLfnR0l4zW2piEC1uLmK7+5+hl3jdsu91yx0R 6sjoKBiPPyV6/EuPo56xfLdwhspm96wFisqGZldg7QOJOVW3x9Wq12STowmhvBcl72G0 q/2N1VrkoXG1XjezoWDMBFKkdR+fwGpjZV3vvU9JdNshNApHmuvEUQmhQVDBOnUTVYua mMOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785296226; x=1785901026; 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:content-type; bh=tu5Y2pXtD7EYXho8m2Td0vTpaq76oKkvCI7opHYUzCY=; b=p5oy8V2OV0s9qIPJNzgw6hmzGNlF0j/5Vz6cVwxcBqqgdAnHaFHK6MCOsPtkIf52mS SGgR3LwwVM4vsQ44D/DlPuXQFOJJay9rU1BLA6GNuf41Zqxszyv0sgrJn8hiuUMNhnQd GnNEQI6iX6WqCDUjOZ2Y7UbmRoAJHVzrZBMZadA8jni+B2f2AFQF5ZM6fEH5+d+wGc/2 IuIx35z3bvdhW1XatGef4hy4zi5ZLYjVIlqaNqaa6jHXdlqSGUDibzMvbfAM+rVQk5ma 7LT0KaCN2wJROXGjJZDJLXA0cJ3hpPQL3Q5OGIYBz01ZIoqqdYhyUvQ7LwRRCsGbR5OS FgLw== X-Forwarded-Encrypted: i=1; AHgh+RqpQ+obZdkh9/dvsMmhZOxy0Fx4ckqP5rUS95Qn/VrKUkx2CEj55AFV+8+SRpB1WM66juctocp1bGBbcqk=@vger.kernel.org X-Gm-Message-State: AOJu0YzY60+vRw0vyEnZseVSMRmHmUkW3wqkU31g8xgNMAR+tzjFR/8U h4LM5Gwa69oMCcR/A2WxZXZgcTiICLJTCDirsE9BH1qBOzVMFsRP/rfw X-Gm-Gg: AR+sD10BPbC9Iztk5V/BzSfdBJ9GjtHnwlSudHZoiC7Xe9uBbJ37LUPeCB7cElr8C+j ZnHTT8bZ9RQ+zLpcY3CCxNNCCfXNH33qn1GIt7FrM9Dxe0AWitIREX4ufdQMlkXZYHG4KFbb80A nUTbS1PxbrjJzaZAVJwAb2e6khpgt+xEffEejxjSCwpllp01Iplik/DVnzNBHG3/KUHYa3HkojC B9dRYRonZPGLHYWWT99+v2me3QUCIJ/38Gr0+MJQqrbi6SzGMD79jAVI/lQHWOJAbOb+hxFfdte omGSCJj8kP1tMwdRLEBSSgWcfjjxKZBNhRAOc5+2PGBC3AAOxQooil9emdh2S7Ab+0fGAQOThsy WmvnTZFnMLV43eeUXK8ltGZIKvOz4Ip2C47PHAKXa4cuFLj4n1RZ9jhwnSqjsADdAefBLbx4PfS WuQiplof7Zmaa1X1YlvQaOCmz/5kmiifu45ZMfyAXarUQ= X-Received: by 2002:a17:902:ced0:b0:2ce:b096:e517 with SMTP id d9443c01a7336-2d015ace388mr57857065ad.5.1785296225577; Tue, 28 Jul 2026 20:37:05 -0700 (PDT) Received: from localhost ([2a09:bac5:42f2:1e1e::300:30]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d022bcad98sm4346605ad.54.2026.07.28.20.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 20:37:05 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: Andrew Morton , Sourabh Jain , Baoquan He , Dave Young , Pratyush Yadav , Mike Rapoport , Pasha Tatashin , Coiby Xu , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 02/10] crash_dump: Fix potential double free and UAF of keys_header Date: Wed, 29 Jul 2026 11:36:42 +0800 Message-ID: <20260729033654.311541-3-coiby.xu@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260729033654.311541-1-coiby.xu@gmail.com> References: <20260729033654.311541-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 If kexec_add_buffer somehow fails, keys_header will be freed. Depending on /sys/kernel/config/crash_dm_crypt_key/reuse, it will lead to the following two problems if the kexec_file_load syscall is called again, 1. Double free of keys_header if reuse=false 2. UAF of keys_header if reuse=true To address these problems and also make it easier to reason about the code, keep two invariants, 1. keys_header will always be freed at the end of kexec_file_load syscall except during kdump image unloading for CPU/memory hot-plugging support 2. There will always be valid keys_header if reuse=true Fixes: 479e58549b0f ("crash_dump: store dm crypt keys in kdump reserved memory") Fixes: 9ebfa8dcaea7 ("crash_dump: reuse saved dm crypt keys for CPU/memory hot-plugging") Reported-by: Sourabh Jain Signed-off-by: Coiby Xu --- include/linux/kexec.h | 6 ++++ kernel/crash_dump_dm_crypt.c | 66 ++++++++++++++++++++++++++---------- kernel/kexec_file.c | 2 ++ 3 files changed, 56 insertions(+), 18 deletions(-) diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 8a22bc9b8c6c..91256d7ff434 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -552,6 +552,12 @@ void set_kexec_sig_enforced(void); static inline void set_kexec_sig_enforced(void) {} #endif +#ifdef CONFIG_CRASH_DM_CRYPT +void kexec_file_post_load_cleanup_dm_crypt(struct kimage *image); +#else +static inline void kexec_file_post_load_cleanup_dm_crypt(struct kimage *image) {} +#endif + #endif /* !defined(__ASSEBMLY__) */ #endif /* LINUX_KEXEC_H */ diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index c685497cd470..4335b6cb1fc4 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -84,18 +84,25 @@ static int add_key_to_keyring(struct dm_crypt_key *dm_key, return r; } -static void get_keys_from_kdump_reserved_memory(void) +static int get_keys_from_kdump_reserved_memory(void) { struct keys_header *keys_header_loaded; + size_t keys_header_size; - arch_kexec_unprotect_crashkres(); + keys_header_size = get_keys_header_size(key_count); + keys_header = kzalloc(keys_header_size, GFP_KERNEL); + if (!keys_header) + return -ENOMEM; + arch_kexec_unprotect_crashkres(); keys_header_loaded = kmap_local_page(pfn_to_page( kexec_crash_image->dm_crypt_keys_addr >> PAGE_SHIFT)); - memcpy(keys_header, keys_header_loaded, get_keys_header_size(key_count)); + memcpy(keys_header, keys_header_loaded, keys_header_size); kunmap_local(keys_header_loaded); arch_kexec_protect_crashkres(); + + return 0; } static int restore_dm_crypt_keys_to_thread_keyring(void) @@ -286,17 +293,28 @@ static ssize_t config_keys_reuse_show(struct config_item *item, char *page) static ssize_t config_keys_reuse_store(struct config_item *item, const char *page, size_t count) { + bool val; + int r; + if (!kexec_crash_image || !kexec_crash_image->dm_crypt_keys_addr) { kexec_dprintk( "dm-crypt keys haven't be saved to crash-reserved memory\n"); return -EINVAL; } - if (kstrtobool(page, &is_dm_key_reused)) + if (kstrtobool(page, &val) || !val) return -EINVAL; - if (is_dm_key_reused) - get_keys_from_kdump_reserved_memory(); + if (is_dm_key_reused) { + pr_info("Already got dm-crypt keys, please continue with kexec_file_load syscall\n"); + } else { + r = get_keys_from_kdump_reserved_memory(); + if (r) { + pr_warn("Failed to get dm-crypt keys from reserved memory\n"); + return r; + } + is_dm_key_reused = true; + } return count; } @@ -369,9 +387,6 @@ static int build_keys_header(void) struct config_key *key; int i, r; - if (keys_header != NULL) - kvfree(keys_header); - keys_header = kzalloc(get_keys_header_size(key_count), GFP_KERNEL); if (!keys_header) return -ENOMEM; @@ -415,8 +430,7 @@ int crash_load_dm_crypt_keys(struct kimage *image) .top_down = false, .random = true, }; - int r; - + int r = 0; if (key_count <= 0) { kexec_dprintk("No dm-crypt keys\n"); @@ -424,14 +438,15 @@ int crash_load_dm_crypt_keys(struct kimage *image) } if (!is_dm_key_reused) { - image->dm_crypt_keys_addr = 0; r = build_keys_header(); - if (r) { - pr_err("Failed to build dm-crypt keys header, ret=%d\n", r); - return r; - } + if (r) + goto out; } + /* + * keys_header will be copied to reserver memory later and then be + * cleaned up at the end of kexec_file_load syscall + */ kbuf.buffer = keys_header; kbuf.bufsz = get_keys_header_size(key_count); @@ -441,18 +456,33 @@ int crash_load_dm_crypt_keys(struct kimage *image) r = kexec_add_buffer(&kbuf); if (r) { pr_err("Failed to call kexec_add_buffer, ret=%d\n", r); - kvfree((void *)kbuf.buffer); - return r; + goto out; } + image->dm_crypt_keys_addr = kbuf.mem; image->dm_crypt_keys_sz = kbuf.bufsz; kexec_dprintk( "Loaded dm crypt keys to kexec_buffer bufsz=0x%lx memsz=0x%lx\n", kbuf.bufsz, kbuf.memsz); +out: + is_dm_key_reused = false; return r; } +void kexec_file_post_load_cleanup_dm_crypt(struct kimage *image) +{ + /* + * For CPU/memory hot-plugging, the kdump image will be reloaded. Prevent + * keys_header from being cleaned up during unloading when + * is_dm_key_reused=true + */ + if (!is_dm_key_reused) { + kfree_sensitive(keys_header); + keys_header = NULL; + } +} + static int __init configfs_dmcrypt_keys_init(void) { int ret; diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c index 2bfbb2d144e6..0421f1e89791 100644 --- a/kernel/kexec_file.c +++ b/kernel/kexec_file.c @@ -139,6 +139,8 @@ void kimage_file_post_load_cleanup(struct kimage *image) kfree(image->image_loader_data); image->image_loader_data = NULL; + kexec_file_post_load_cleanup_dm_crypt(image); + kexec_file_dbg_print = false; } -- 2.55.0