From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 C210737F019 for ; Fri, 1 May 2026 23:44:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777679098; cv=none; b=KurDQTzDdCNlKDk8vOOFHiL1IIbFPRoV0TlflpEFyPZLd/gYhru8X/AWUupBP54dk7NaEHtKJdHKET7T3sdkY5GKHUXENR++lUQYi93g4OGgR4KR4x5Zvap5k+wizAd3slGLC7c7Gc3w/F4o9SAskeIKyeMLCq5SnPPdVtqjzos= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777679098; c=relaxed/simple; bh=cqujhk4WjwQZNSEbJf3AqvY0m45Sb1rgR6wFmKIcupo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fQElUhMrbrYHHFo+lDb+c5Pwp2uKxfHFlDSVkZKhE4Q8DOmYtrZHMnfLYI/RPhD1LVR/0P9KayEUeyhTEXFrehDTwRZV7cfop/BOGUWWKhRsr/nLDuL2DFySYeKeqm+gsHbg9dPy2B9aoCvno3BDIVxf83MK6Ji5nn27UGC3eyk= 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=JZg4ZE6r; arc=none smtp.client-ip=209.85.214.169 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="JZg4ZE6r" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2b0afa0210bso12421145ad.2 for ; Fri, 01 May 2026 16:44:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777679096; x=1778283896; 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=0ZwXWqX5mmyJ9M+JCMtLba+Y9auGcISsk1ZjDGvIp3s=; b=JZg4ZE6r4U9oSCaWt2doSCvtDoBHQfIVTuq7d8Jjpvr1ax8prp05KSLPSqdP8rMzMn JQx5ywjqi9WT6VQM6JPF1+ppJ8Yik44GD5FSOUHdeXJt2Y+BlKZZhHpTbeCg2cxASHB+ W5B/8NWsXCuGI10GeRK9jpw2qTLSdErcoQJ7wHwVCR4unBzULHd615xCNPtCv3joe8g3 whWGtW0ZG9Shz23nC5vwkLSrWQt8KY8jvlOPf7uo403sK5bQbtSG9dPDzhKzrUlAPMgg 8oHhUKmBlJTUqFUmYj8uat018pOrLK0e7L4Zf4S6jbJ2ztUyfvbm4zGgkt5Hhtwv5f3I s6uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777679096; x=1778283896; 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=0ZwXWqX5mmyJ9M+JCMtLba+Y9auGcISsk1ZjDGvIp3s=; b=o0e6CD8n6QqYZJ+RQzkvo1e8EsbCJ0TH/CKlq+jmVjygaKeGqYcip8wuyGuwtXbyTZ lLFiPhyuZ7s2vkfAMrcuOzQIIhhxESYqDQssIjzV2oJsYJViY5fcNY/vcYK5/mUfYhYN rAiR2ew7jeWaP0wTOUPq2zg473bwatY4/Ejx/f8n6cwXAd5JwY4zyYmWgJ3P7G6A48Cw 6mqXX9C3s0JkfUKnBbwkkn7QmJSvLfA7FK3A74tUIWj33qxNSOUH1yAPQ1skoSw8Vx5m 1100h9vG18EKSYUP2hRoIIwe6CX3UtiBXnApQ5/q3RpZBj6FSv+jCEKvXqXteralV4O7 teZg== X-Forwarded-Encrypted: i=1; AFNElJ8xOEsS41qWvDQTs+q5tBLfRr18SdGT+zYUB7LUVdhrvlDiZpMYsNmUqo5GIe3Kp8gtfqPm+sbARSuwPEY=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+4sLyjbOJp24oi/v6qBoDBUstMzraM+1tNwcWdVtqaMLGhfL3 qwctqE+oJNsJnEnghsqSuClinAs0bQwYVwz31AVE05X1vo81I4VT7j3cZLQO5J3vR7tV3g== X-Gm-Gg: AeBDievVpzuo8eFp4FGVxoLrFbLh/cEtl9vOwSuigx469e7GPMaAE1Q8yg+OLLhBZQ9 r2tedHXMebgPSpxAzvQr0aV5aBmqe/YHsiu5EdQmgLlHqjtlYAIvMz48HHAZSsQObjHfJmMc351 Ct4SUPHLdZYK1KkAtbR0ojkXl5m7C6HV+U0VxkDWKzr2X/VZBnb3gMlGCk93XyH/qfpA6CM888/ ZNFjQMPd9M1A7X4P4xmqxEcAGCuwbcUrINCr8ppTC440wEHl5r8UfISAmHUtRoiSW60WQ8pmktQ evddUy9sxajb+m+SRz+SzOmbt/umlqzPMF2RJZ0TxvnhiJZmeDuF45+dfnxcx4tA647cH5yFHaM y5Skd6LBHa5D8eSzSKDd6oOtPqjlZFw6Ig9K6eDNfvOC/Z2fwf1RQzlhBsaUWfyeIOzXJa9ucrK ZF7QlsKNokJYRiNWaczsokEdWqeEqr9Q== X-Received: by 2002:a17:903:1aeb:b0:2b4:65d8:6a20 with SMTP id d9443c01a7336-2b9f256dbe8mr10210015ad.2.1777679096143; Fri, 01 May 2026 16:44:56 -0700 (PDT) Received: from localhost ([121.237.249.41]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b9cae1e2a9sm31131775ad.46.2026.05.01.16.44.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 16:44:55 -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 7/9] crash_dump: Improve readability of config_keys_restore_store Date: Sat, 2 May 2026 07:43:36 +0800 Message-ID: <20260501234342.2518281-8-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 config_keys_restore_store currently doesn't validate the user input before restoring dm-crypt keys. Although it's not necessary for the case of vmcore dumping, it's better to do it for the sake of consistency and code readability. Also check the return code of restore_dm_crypt_keys_to_thread_keyring. Fixes: 62f17d9df692 ("crash_dump: retrieve dm crypt keys in kdump kernel") Signed-off-by: Coiby Xu --- kernel/crash_dump_dm_crypt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index 545d712428d3..36e51807d94f 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -358,12 +358,16 @@ static ssize_t config_keys_restore_show(struct config_item *item, char *page) static ssize_t config_keys_restore_store(struct config_item *item, const char *page, size_t count) { - if (!restore) - restore_dm_crypt_keys_to_thread_keyring(); + bool val; - if (kstrtobool(page, &restore)) + if (kstrtobool(page, &val)) return -EINVAL; + if (val && !restore) { + if (!restore_dm_crypt_keys_to_thread_keyring()) + restore = true; + } + return count; } -- 2.54.0