From patchwork Fri Nov 4 11:30:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coiby Xu X-Patchwork-Id: 15481 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp342075wru; Fri, 4 Nov 2022 04:40:59 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6aqq1WAnB7OS1O/MbfEt1j/aePKNxllpzruGkHUROMjqlrC8KDFWWv4NA4Vu9l7hVZbTpn X-Received: by 2002:a17:907:75f1:b0:78a:f935:647d with SMTP id jz17-20020a17090775f100b0078af935647dmr33594326ejc.587.1667562059636; Fri, 04 Nov 2022 04:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667562059; cv=none; d=google.com; s=arc-20160816; b=Ed5RnASn9+Dffh9Qr2XEALpRau1Mkzo4KA3afJh2iuXyNu6LxF+2aZSkjYzQHr66u1 76USYUu9JZgWqBKc3Jp56FrG+lL2la0S2dBl7pJyZHxriebwFGIwIk11EPnnqzgwHRu9 AfSzfuM56+fuRs6ZAZZUSbwwOHv6gZnE/gSNFtE4+CPCxQ79zrVDav0gYPyqFv/hoGGk UcbIDtpGv5R2HD3GqNmr6mmlLSM5YpfFYuHbiP3ylNF7Pb34uNrJHL0VjS7l5tiEkAx9 /DIGV0skWeMyiUDOLcCH465emHjMzcMXnj9bHRy51yjfkfRb+JE/2iuaCG6R4ZsGpk2j 2CLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tChygk51qSEpKRajoEIhCZC1g4gkmcKbQyIR3WZ7WJ0=; b=gh+ytjUzL7MZOYGX/YD009Y3H9BXJ1DAd7O3IbNksobRDcqvxYd7+CFHM8TTIzpv/N XBFMLciXCNOY6zGFy6YSi64YhmiQ8LJmhGFzWO9mTC1nig/izrK05GNfIQONtUM/R2ya a9feK2JZaZB7a4JHqXtzEC0E5W+7CNb0NZkHty5/kVIc5sDyDQ80UdQOwbGjsUvONxi3 wSt6X4LXHRf58nENoYhjPgCl/Pz5DO0QoC0vx8qa5RvI2SvazSc4S31BsriVjpc3ZJsq 8xVe1TlJTlf3QOdc8vaktPIM39QutvRppeZr6ifcX79lV+KkmCyHiIaw2CSAOdxeNnmw G9PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dcF+UL2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg39-20020a170907972700b007abafd4d7d0si2726471ejc.702.2022.11.04.04.40.25; Fri, 04 Nov 2022 04:40:59 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dcF+UL2P; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231154AbiKDLcK (ORCPT + 99 others); Fri, 4 Nov 2022 07:32:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231795AbiKDLb6 (ORCPT ); Fri, 4 Nov 2022 07:31:58 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3786A25C7A for ; Fri, 4 Nov 2022 04:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667561457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tChygk51qSEpKRajoEIhCZC1g4gkmcKbQyIR3WZ7WJ0=; b=dcF+UL2P5nCXwo0ot/00Mv/qf5kfYUpVejnG8KUFgpWKZYqLgFnUX9fIPO9LVM50eOFGw0 1vibVVCSZPx1MX08p07ahDThBvZv0tHS48Bqhczq2ioskBq3Mkbs84/YnbPy6khhLqS/F/ /TJkv13gaCPSDD+7jDUOwZ21BHFbVKY= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-670-7ZKJU8moOMiwfrUNU4MnHQ-1; Fri, 04 Nov 2022 07:30:55 -0400 X-MC-Unique: 7ZKJU8moOMiwfrUNU4MnHQ-1 Received: by mail-pj1-f71.google.com with SMTP id q1-20020a17090aa00100b002139a592adbso5430142pjp.1 for ; Fri, 04 Nov 2022 04:30:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=tChygk51qSEpKRajoEIhCZC1g4gkmcKbQyIR3WZ7WJ0=; b=YxWvzygzYV/IbGd8tZaTFRSGWAL4i3vx8Jsk3bT+gERa8zchozDAKubkV1D59l0BzU CN/kMvoof7Vny4dgZsig60f5uF4/WOUSOrff+VM5O3edMKdtYJIuIllddseW6bTbcL5s vni4jk5TPqGyM2d//ZIrHf6XGLEvL9RUTize6b3AUEGKNGBGRSvfo+bkEyFVkHCKwNtR wSPI+vKtTHcUgZW1DZLtAVFkYqDm8saBUSJTKRvbKm7Ac9nqESeP5xymt9rYvgmZc1ZR tomjrfr8Y0lcyoZnXAWr8RnAf22350+If69KPSoXGurWcMbUdaV18XTk52rxO7PqMfuM 1jQQ== X-Gm-Message-State: ACrzQf3VxyRYLjIASg37YjPteq+BExnw2YuWPhpFN5BDppXUgA5zfT22 nukYFXO2Nf38OC7WbeAuYdxwGZwdTuW/I5HYOHXdHL+BhefaCZ3JGSyh0PIPvjKP6jAEflOgeg6 hhUfMrp9AgxR0oub1AmjrR5tH X-Received: by 2002:a05:6a00:3698:b0:56d:3180:e88f with SMTP id dw24-20020a056a00369800b0056d3180e88fmr32007698pfb.66.1667561454068; Fri, 04 Nov 2022 04:30:54 -0700 (PDT) X-Received: by 2002:a05:6a00:3698:b0:56d:3180:e88f with SMTP id dw24-20020a056a00369800b0056d3180e88fmr32007679pfb.66.1667561453799; Fri, 04 Nov 2022 04:30:53 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id ca8-20020a17090af30800b0020669c8bd87sm1483003pjb.36.2022.11.04.04.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Nov 2022 04:30:53 -0700 (PDT) From: Coiby Xu To: kexec@lists.infradead.org Cc: Milan Broz , Thomas Staudt , Kairui Song , dm-devel@redhat.com, Jan Pazdziora , Pingfan Liu , Baoquan He , Dave Young , linux-kernel@vger.kernel.org, Vivek Goyal Subject: [RFC v2 5/5] crash_dump: retrieve LUKS volume key in kdump kernel Date: Fri, 4 Nov 2022 19:30:00 +0800 Message-Id: <20221104113000.487098-6-coxu@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221104113000.487098-1-coxu@redhat.com> References: <20221104113000.487098-1-coxu@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748565554334348462?= X-GMAIL-MSGID: =?utf-8?q?1748565554334348462?= Crash kernel will retrieve the LUKS volume key based on the luksvolumekey command line parameter. When libcryptsetup writes the key description to /sys/kernel/crash_luks_volume_key, crash kernel will create a thread keyring and add a logon key. Signed-off-by: Coiby Xu --- include/linux/crash_dump.h | 2 + kernel/crash_dump.c | 116 ++++++++++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h index 0f3a656293b0..bc848e058c64 100644 --- a/include/linux/crash_dump.h +++ b/include/linux/crash_dump.h @@ -15,6 +15,8 @@ extern unsigned long long elfcorehdr_addr; extern unsigned long long elfcorehdr_size; +extern unsigned long long luks_volume_key_addr; + #ifdef CONFIG_CRASH_DUMP extern int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size); extern void elfcorehdr_free(unsigned long long addr); diff --git a/kernel/crash_dump.c b/kernel/crash_dump.c index 9c202bffbb8d..77a6b84415e8 100644 --- a/kernel/crash_dump.c +++ b/kernel/crash_dump.c @@ -5,7 +5,10 @@ #include #include +#include +#include #include + /* * stores the physical address of elf header of crash image * @@ -16,6 +19,8 @@ unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX; EXPORT_SYMBOL_GPL(elfcorehdr_addr); +unsigned long long luks_volume_key_addr; +EXPORT_SYMBOL_GPL(luks_volume_key_addr); /* * stores the size of elf header of crash image */ @@ -41,6 +46,76 @@ static int __init setup_elfcorehdr(char *arg) } early_param("elfcorehdr", setup_elfcorehdr); +static int __init setup_luksvolumekey(char *arg) +{ + char *end; + + if (!arg) + return -EINVAL; + luks_volume_key_addr = memparse(arg, &end); + if (end > arg) + return 0; + + luks_volume_key_addr = 0; + return -EINVAL; +} + +early_param("luksvolumekey", setup_luksvolumekey); + +/* + * Architectures may override this function to read LUKS master key + */ +ssize_t __weak luks_key_read(char *buf, size_t count, u64 *ppos) +{ + struct kvec kvec = { .iov_base = buf, .iov_len = count }; + struct iov_iter iter; + + iov_iter_kvec(&iter, READ, &kvec, 1, count); + return read_from_oldmem(&iter, count, ppos, false); +} + +static int retrive_kdump_luks_volume_key(u8 *buffer, unsigned int *sz) +{ + unsigned int key_size; + size_t lukskeybuf_sz; + unsigned int *size_ptr; + char *lukskeybuf; + u64 addr; + int r; + + if (luks_volume_key_addr == 0) { + pr_debug("LUKS master key memory address inaccessible"); + return -EINVAL; + } + + addr = luks_volume_key_addr; + + /* Read LUKS master key size */ + r = luks_key_read((char *)&key_size, sizeof(unsigned int), &addr); + + if (r < 0) + return r; + + pr_debug("Retrieve LUKS master key: size=%u\n", key_size); + /* Read in LUKS maste rkey */ + lukskeybuf_sz = sizeof(unsigned int) + key_size * sizeof(u8); + lukskeybuf = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, + get_order(lukskeybuf_sz)); + if (!lukskeybuf) + return -ENOMEM; + + addr = luks_volume_key_addr; + r = luks_key_read((char *)lukskeybuf, lukskeybuf_sz, &addr); + + if (r < 0) + return r; + size_ptr = (unsigned int *)lukskeybuf; + memcpy(buffer, size_ptr + 1, key_size * sizeof(u8)); + pr_debug("Retrieve LUKS master key (size=%u): %48ph...\n", key_size, buffer); + *sz = key_size; + return 0; +} + static u8 *luks_volume_key; static unsigned int luks_volume_key_size; @@ -62,12 +137,48 @@ static DECLARE_DELAYED_WORK(wipe_luks_volume_key_work, _wipe_luks_volume_key); static unsigned __read_mostly wipe_key_delay = 3600; /* 1 hour */ +static int retore_luks_volume_key_to_thread_keyring(const char *key_desc) +{ + key_ref_t keyring_ref, key_ref; + int ret; + + /* find the target keyring (which must be writable) */ + keyring_ref = lookup_user_key(KEY_SPEC_THREAD_KEYRING, 0x01, KEY_NEED_WRITE); + if (IS_ERR(keyring_ref)) { + pr_alert("Failed to get keyring"); + return PTR_ERR(keyring_ref); + } + + luks_volume_key = kmalloc(128, GFP_KERNEL); + ret = retrive_kdump_luks_volume_key(luks_volume_key, &luks_volume_key_size); + if (ret) { + kfree(luks_volume_key); + return ret; + } + + /* create or update the requested key and add it to the target keyring */ + key_ref = key_create_or_update(keyring_ref, "logon", key_desc, + luks_volume_key, luks_volume_key_size, + KEY_PERM_UNDEF, KEY_ALLOC_IN_QUOTA); + + if (!IS_ERR(key_ref)) { + ret = key_ref_to_ptr(key_ref)->serial; + key_ref_put(key_ref); + pr_alert("Success adding key %s", key_desc); + } else { + ret = PTR_ERR(key_ref); + pr_alert("Error when adding key"); + } + + key_ref_put(keyring_ref); + return ret; +} + static int crash_save_temp_luks_volume_key(const char *key_desc, size_t count) { const struct user_key_payload *ukp; struct key *key; - if (luks_volume_key) { memset(luks_volume_key, 0, luks_volume_key_size * sizeof(u8)); kfree(luks_volume_key); @@ -100,7 +211,8 @@ int crash_sysfs_luks_volume_key_write(const char *key_desc, size_t count) { if (!is_kdump_kernel()) return crash_save_temp_luks_volume_key(key_desc, count); - return -EINVAL; + else + return retore_luks_volume_key_to_thread_keyring(key_desc); } EXPORT_SYMBOL(crash_sysfs_luks_volume_key_write);