From patchwork Thu Jan 16 06:58:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 13941325 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 CF910199E89 for ; Thu, 16 Jan 2025 06:58:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737010730; cv=none; b=oID5G2A5c+PAArow64nbHPgiDs0+0QlI/NkIK5d9+j0r6vysGbv+ZeN3UgQqmrER5Td+BDK54PQXTAgYGMgS1F5mjh8yObD2o4pg94ckKrEiIdpAW6w5ak2K1w4MULMBTcUvl1AdN2rMygtuS2qtkFZD8YW+Wdiu6wMz7IW6Iv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737010730; c=relaxed/simple; bh=0ssQhuDfl/5VpyiMqxSR0IwAfjRFUrcMVdKYNqGH8bE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=MpQWkUa1ScVYRMPzL2w5RivnHCa3MI49jnJBRZch5JXAyQqmJ0OONUI5373JfolU+qIJ97A4PK7NAgWZQBfPpDlnadME+uT67PhBQlKoE3GhfGyjb4BBGFJmPZ8DAbFfoJx7FXGIQXAQFJIFgCGUVvQs9+tkfPmoMUejthtvL2A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=MXpctknv; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MXpctknv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1737010727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tQvCsR9EXSN3ga2DmGxkK/BjC0F26mqQj7WZLS4qcAw=; b=MXpctknvlLXuIFMV9V90P5zPF38/nT9bxbrcEC9twImPs2rhVKIZ+7d65J15MhrPBBEVY+ pyQsNG8p0hPSxxIuJj7m4clNibcExOamrs9/oFSquErTloXa3ImMw+qKAOEk685sAA//fn 8AWZDg4Djx+f00/K9hLh0rKd4KCb7mI= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-326-cE_Svj8ZO4SE91vZPsw-NA-1; Thu, 16 Jan 2025 01:58:46 -0500 X-MC-Unique: cE_Svj8ZO4SE91vZPsw-NA-1 X-Mimecast-MFC-AGG-ID: cE_Svj8ZO4SE91vZPsw-NA Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2164fad3792so11335915ad.0 for ; Wed, 15 Jan 2025 22:58:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737010720; x=1737615520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tQvCsR9EXSN3ga2DmGxkK/BjC0F26mqQj7WZLS4qcAw=; b=dhfnF32UXVI/VS9OqF3VJP9JS9B7JsO0IjRoqllMznVIvPxgSmT1mDq61W+r8bzuhV IOZtlA3xK36jJfkEJ0G2xIIdKSUfY413P1cWNK0bIO++uksZyINoMMPP9ilPHSmZ5DsX YVSwrEqlaj7TW1GDJEnz3H1oez5ibxjbVS2NvKTRfTPEka3xCPZakrSewLadphjnTk6V JftKyg+tehn0lPaASnnvM1cRiArHnqok9dP4as2iK9q++alt+7lkpBmBfN2N+fPvhFlm X7585TJa558xc1CJLYHdgbCFRSttzjH+G81LrspKZIaXDfVlSPjEIgOKeOGZavluFCQk ZezQ== X-Forwarded-Encrypted: i=1; AJvYcCUOdRaHwIlbsz5KEYODoW3yp77CDE6h/4TmeCDf2z3zOdvxSnaZhV3cPuWRDpxVN19R8XCQpwQRhM2djW/FG2g=@vger.kernel.org X-Gm-Message-State: AOJu0YwfDXI4oWoRjC46pWQFe5nE6wUkP3gxQBwGIM+BoJvnjDSD6LBB sp3szk5/+YDi8WVr+o/SCyzaz+ryD4LL0Juv6TrOYcxeiOqU+3LicJu8/N1NjyGpFwgzKFUExW/ 2VnMy3c5T76HGLtCwoGuTUscvKoLsmLm9e4FKcb4SFGQKOjdBe0/06jE+VUQNcqwwsA== X-Gm-Gg: ASbGnctnWiPL72OcWBwt6C/U8Z5JqCR6VfI+398EM80LMEaah4/hOjC+Gi0ZKScY3OM t534y1OGhjou/0VsUCjA+n7+40dM+bQZfFccS/KTFVWlvPWu/mncU42wKs6TCS8bYREKjWFPQ4r AUibgj9ErTTQGUESmwpUnuAsxb5q6HLuhQRw9HqDnzSegU3mX3rGNvMoS2oDQdS+mkYsLEsYszs aLW9Xt/cjapUpUnriMOs19WzWvX3XRO1iWcBAH8ztJDLIO7 X-Received: by 2002:a05:6a20:4325:b0:1e1:b062:f3fa with SMTP id adf61e73a8af0-1e88d1dba97mr60123651637.34.1737010720565; Wed, 15 Jan 2025 22:58:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IF0mUbg5KfGVjWvvefswEmAHcx/8ryY08l4nYmf/QtfmhIT1/A0W8mtD2C6GcsE+LcNZkwPgw== X-Received: by 2002:a05:6a20:4325:b0:1e1:b062:f3fa with SMTP id adf61e73a8af0-1e88d1dba97mr60123596637.34.1737010720061; Wed, 15 Jan 2025 22:58:40 -0800 (PST) Received: from localhost ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72d40658efdsm10700322b3a.90.2025.01.15.22.58.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 22:58:39 -0800 (PST) From: Coiby Xu To: kexec@lists.infradead.org Cc: Ondrej Kozina , Milan Broz , Thomas Staudt , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Kairui Song , Jan Pazdziora , Pingfan Liu , Baoquan He , Dave Young , linux-kernel@vger.kernel.org, x86@kernel.org, Dave Hansen , Vitaly Kuznetsov , Vivek Goyal , Eric Biederman , Kees Cook , "Gustavo A. R. Silva" , linux-hardening@vger.kernel.org (open list:KERNEL HARDENING (not covered by other areas):Keyword:\b__counted_by(_le|_be)?\b) Subject: [PATCH v7 3/7] crash_dump: store dm crypt keys in kdump reserved memory Date: Thu, 16 Jan 2025 14:58:18 +0800 Message-ID: <20250116065825.1041558-4-coxu@redhat.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250116065825.1041558-1-coxu@redhat.com> References: <20250116065825.1041558-1-coxu@redhat.com> Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: WKHiuDFWxnJpxHYOtI6smA2g8fCe3Zev4rov92TRDgo_1737010726 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true When the kdump kernel image and initrd are loaded, the dm crypts keys will be read from keyring and then stored in kdump reserved memory. Assume a key won't exceed 256 bytes thus MAX_KEY_SIZE=256 according to "cryptsetup benchmark". Signed-off-by: Coiby Xu --- include/linux/crash_core.h | 6 +- include/linux/kexec.h | 4 ++ kernel/crash_dump_dm_crypt.c | 129 +++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 1 deletion(-) diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index 44305336314e..2e6782239034 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -34,7 +34,11 @@ static inline void arch_kexec_protect_crashkres(void) { } static inline void arch_kexec_unprotect_crashkres(void) { } #endif - +#ifdef CONFIG_CRASH_DM_CRYPT +int crash_load_dm_crypt_keys(struct kimage *image); +#else +static inline int crash_load_dm_crypt_keys(struct kimage *image) {return 0; } +#endif #ifndef arch_crash_handle_hotplug_event static inline void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) { } diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 61269e97502a..ec7504ba80e9 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -398,6 +398,10 @@ struct kimage { void *elf_headers; unsigned long elf_headers_sz; unsigned long elf_load_addr; + + /* dm crypt keys buffer */ + unsigned long dm_crypt_keys_addr; + unsigned long dm_crypt_keys_sz; }; /* kexec interface functions */ diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index 62a3c47d8b3b..8c093c743d58 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -1,14 +1,62 @@ // SPDX-License-Identifier: GPL-2.0-only +#include +#include #include #include #include #include #define KEY_NUM_MAX 128 /* maximum dm crypt keys */ +#define KEY_SIZE_MAX 256 /* maximum dm crypt key size */ #define KEY_DESC_MAX_LEN 128 /* maximum dm crypt key description size */ static unsigned int key_count; +struct dm_crypt_key { + unsigned int key_size; + char key_desc[KEY_DESC_MAX_LEN]; + u8 data[KEY_SIZE_MAX]; +}; + +static struct keys_header { + unsigned int total_keys; + struct dm_crypt_key keys[] __counted_by(total_keys); +} *keys_header; + +static size_t get_keys_header_size(size_t total_keys) +{ + return struct_size(keys_header, keys, total_keys); +} + +static int read_key_from_user_keying(struct dm_crypt_key *dm_key) +{ + const struct user_key_payload *ukp; + struct key *key; + + kexec_dprintk("Requesting key %s", dm_key->key_desc); + key = request_key(&key_type_logon, dm_key->key_desc, NULL); + + if (IS_ERR(key)) { + pr_warn("No such key %s\n", dm_key->key_desc); + return PTR_ERR(key); + } + + ukp = user_key_payload_locked(key); + if (!ukp) + return -EKEYREVOKED; + + if (ukp->datalen > KEY_SIZE_MAX) { + pr_err("Key size %u exceeds maximum (%u)\n", ukp->datalen, KEY_SIZE_MAX); + return -EINVAL; + } + + memcpy(dm_key->data, ukp->data, ukp->datalen); + dm_key->key_size = ukp->datalen; + kexec_dprintk("Get dm crypt key (size=%u) %s: %8ph\n", dm_key->key_size, + dm_key->key_desc, dm_key->data); + return 0; +} + struct config_key { struct config_item item; const char *description; @@ -130,6 +178,87 @@ static struct configfs_subsystem config_keys_subsys = { }, }; +static int build_keys_header(void) +{ + struct config_item *item = NULL; + 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; + + keys_header->total_keys = key_count; + + i = 0; + list_for_each_entry(item, &config_keys_subsys.su_group.cg_children, + ci_entry) { + if (item->ci_type != &config_key_type) + continue; + + key = to_config_key(item); + + strscpy(keys_header->keys[i].key_desc, key->description, + KEY_DESC_MAX_LEN); + r = read_key_from_user_keying(&keys_header->keys[i]); + if (r != 0) { + kexec_dprintk("Failed to read key %s\n", + keys_header->keys[i].key_desc); + return r; + } + i++; + kexec_dprintk("Found key: %s\n", item->ci_name); + } + + return 0; +} + +int crash_load_dm_crypt_keys(struct kimage *image) +{ + struct kexec_buf kbuf = { + .image = image, + .buf_min = 0, + .buf_max = ULONG_MAX, + .top_down = false, + .random = true, + }; + int r; + + + if (key_count <= 0) { + kexec_dprintk("No dm-crypt keys\n"); + return -ENOENT; + } + + image->dm_crypt_keys_addr = 0; + r = build_keys_header(); + if (r) + return r; + + kbuf.buffer = keys_header; + kbuf.bufsz = get_keys_header_size(key_count); + + kbuf.memsz = kbuf.bufsz; + kbuf.buf_align = ELF_CORE_HEADER_ALIGN; + kbuf.mem = KEXEC_BUF_MEM_UNKNOWN; + r = kexec_add_buffer(&kbuf); + if (r) { + kvfree((void *)kbuf.buffer); + return r; + } + 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); + + return r; +} + + static int __init configfs_dmcrypt_keys_init(void) { int ret;