From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 2ECA93890F0 for ; Wed, 29 Jul 2026 03:37:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785296252; cv=none; b=K3xyWSLrR9NHbsfNX5U2xQ7SG3HKhCCJssTK36AM+5UxS+f0snmcXxm8uCZ4dNm+NUFettsNLPuxmwMbKux0wwUWs4Bq9aBzMLvhi79YIIhvkg4KqzR5DYQ1FZEWR3fBXmvpZKYeE3vd7jtgmns/KCzATkleG2VtzXbdlRcE2No= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785296252; c=relaxed/simple; bh=JWFTTseuhLWO3rq3twI62FHX5ezy7Nu0dWH1vn6KbfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JOcjWLml3wk3w48YjFkATf2upNpX5F0ocLsY5hHNvIRYe8KMTDHrAUd0343TETbIsapdIJ/+STFU6F2QuleBZiKHnBSt7PXHyV60lGEXf6/gLZ/rKnyHbcjvFUHCIDmCzHXkFJtmgJs3yBrhGXUFrj8FczJMw2f51T4/7G4c44Q= 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=PU+g0qg0; arc=none smtp.client-ip=209.85.214.175 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="PU+g0qg0" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2ceab75934dso6732925ad.2 for ; Tue, 28 Jul 2026 20:37:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785296250; x=1785901050; 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=z41o0ObBkb9PG0abYLZeVrJjA+L2Zru5sYALSsH0Tb0=; b=PU+g0qg0Uem0g6CSm0y9+AC0TtnYpJL8TdLfdvxwXtMwtkSKNW0gr0DFa+jdYwsUm3 qqjDSMFjd+fnCQvuYF70k1G6augvj8W58LFkD9uH1NB0XF0idMPIVQQbugSvc3qloi6N 4i1R8T8/UM/GAxe/bckJXcCYF7/mAwEGBDJvXOFcEjEVb9Zd3gXCX/Bv2KifDnW4deBg VWumxAOjq7uXv6HGA6/SrQWKLBhCsdKytHS9u1jkBTy1iVNqlKL+iHjeJUNb4l29Ggrn aOILFEVR9U1dXVQd8WxpgSKogmhBD+NM5zS22DMofdRZOfKX9fgsQSf9q6Ss/+ILjI92 9kdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785296250; x=1785901050; 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=z41o0ObBkb9PG0abYLZeVrJjA+L2Zru5sYALSsH0Tb0=; b=F9fAJ8v0hzPwB22dbuaojxzl+K7+dAGb/wKfETwmPDBRbNki1e7BZ+mUoB3p1UuPEN NTnZlMABlhsAuLsWEwUl65ywZ973CNm5SWUNR6prfYpoznZT8BRQXRkKOL0Qz5F1D/AP kySET3GkugtLJRlTRqTL642y5iXjroDko8U6eSnNEFf1VuVSO49iuONg3nI15ii+46dh am0bXsctIna0vUhwBBfZDcXP0BVrbGnwY+WRsCB+MXAUxh9wHbbb/9gTZ3YpnQF05Jc1 FHpsjhDVNcAj6UXs2BwEDSU4g2q7WW6ySKilkH+mxf663r/JKexc9+evNvjODhZpjdOh sy2g== X-Forwarded-Encrypted: i=1; AHgh+RrXME7eeT0224Vnyr6JG6DkvyOFI/Cj22Sf/sJFJgnbBYDk4Hy2w/+KtndYy6ibTkTNjEqAqsjnpH4bdZA=@vger.kernel.org X-Gm-Message-State: AOJu0YzmqUOwc5SQyrlCZ0eNJt2L1PSdrQhMr0LCDBYN5/2Zf3PddCg4 8ZFq6VEa/NEOE9mzBu4fVVZg8mBV3xUZBvOxtL6iQc/C1EmJT1vMfh0D X-Gm-Gg: AR+sD10h/gpdkZA7zuMbwOxDxmufq/qSUw6Ah7d+D/J1QsfJokDrpz5KnsvGd6xxc6E vf1GSqcLNTFFfWriJVPrs2rffOklu5xkWelO/+IsQBw/aw/WoL9C26Mmm4u/4bD8ohcxQPZ44E4 1wmYD1vqaTb9wfTX0F5sgnThiyR1Uh7eUVZ+Jrjq+Wruiez0X/Vo9skTlGjx5briQd8hAkAiekI JqTI0TrJBXxS5N+sSXZx4atiY7sbnFVXAH7Uthdp09dNjvX0Yct4xHo1O3k83dxBT4bTLyxhmcU n40Ds7kcu9jIo8a5mhiA4fuG3p2J4MsZtW1y2o40zrM2eJCKnl5YP1G7evwtIioUTz4b1387Gz5 qJqFCYkizVmeNWMtwjv1CsTkhuUipKYywFvGvNwMcZdUmqm5TqMaZO7bTVrmv8pwkzCFNgax4XE Y0aCaNyYqVyg1j37SREcd+QHAPvUY/feZ3GTqIFsH8O1c= X-Received: by 2002:a05:6a21:d8a:b0:3c3:92ba:c61f with SMTP id adf61e73a8af0-3c8aaf78e1amr6304133637.8.1785296250572; Tue, 28 Jul 2026 20:37:30 -0700 (PDT) Received: from localhost ([2a09:bac5:42f2:1e14::2ff:53]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cbdba3519a5sm275060a12.18.2026.07.28.20.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2026 20:37:30 -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 , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 08/10] crash_dump: Check the function return codes in restore_dm_crypt_keys_to_thread_keyring Date: Wed, 29 Jul 2026 11:36:48 +0800 Message-ID: <20260729033654.311541-9-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 We should check the return codes so we can abort if keyring allocation or reading old memory fails. Note there is no need to refer a key add_key_to_keyring, so delete related code. Signed-off-by: Coiby Xu --- kernel/crash_dump_dm_crypt.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index 1f4549956824..b5b78656cf06 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -65,7 +65,7 @@ static int add_key_to_keyring(struct dm_crypt_key *dm_key, key_ref_t keyring_ref) { key_ref_t key_ref; - int r; + int r = 0; /* create or update the requested key and add it to the target keyring */ key_ref = key_create_or_update(keyring_ref, "user", dm_key->key_desc, @@ -73,8 +73,6 @@ static int add_key_to_keyring(struct dm_crypt_key *dm_key, KEY_USR_ALL, KEY_ALLOC_IN_QUOTA); if (!IS_ERR(key_ref)) { - r = key_ref_to_ptr(key_ref)->serial; - key_ref_put(key_ref); pr_debug("Success adding key %s", dm_key->key_desc); } else { r = PTR_ERR(key_ref); @@ -133,9 +131,14 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) } addr = dm_crypt_keys_addr; - dm_crypt_keys_read((char *)&key_count, sizeof(key_count), &addr); + ret = dm_crypt_keys_read((char *)&key_count, sizeof(key_count), &addr); + if (ret < 0) { + pr_err("Failed to read the number of dm-crypt keys\n"); + goto out; + } + if (key_count > KEY_NUM_MAX) { - pr_warn("Failed to read the number of dm-crypt keys\n"); + pr_warn("Read %u dm-crypt keys (max=%u)\n", key_count, KEY_NUM_MAX); ret = -1; goto out; } @@ -150,12 +153,18 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) goto out; } - dm_crypt_keys_read((char *)keys_header, keys_header_size, &addr); + ret = dm_crypt_keys_read((char *)keys_header, keys_header_size, &addr); + if (ret < 0) { + pr_err("Failed to read dm-crypt keys\n"); + goto out; + } for (int i = 0; i < keys_header->total_keys; i++) { key = &keys_header->keys[i]; pr_debug("Get key (size=%u)\n", key->key_size); - add_key_to_keyring(key, keyring_ref); + ret = add_key_to_keyring(key, keyring_ref); + if (ret) + break; } out: -- 2.55.0