From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 A62CA20DD51 for ; Sat, 4 Jul 2026 11:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783164452; cv=none; b=SxEc4XoaKpH15Plm7AJ1ao1TrCRgkwOGF5SMFs4H5CVRYSgn+fPyu/VImY1rn27W5Fk8ldooXYvchQH3JWwXteBIw4yYHAsQsnPjL4zbjIDPPwq2i0OV3F38hDFhf64atbFvsI99rlbjdOXlTMFVHKYUppGwcHX+6TmkQAtv1oY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783164452; c=relaxed/simple; bh=uSKHFmDwbqVGTRsOKqAXHD9MbCs+LTgQjIgDGf6RPNs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=An87nWBmt7hcyOmRjqHX4UfLXg/lUwpi8VK+xs1bBKrtHj+bFIr+z1yIQAmJZHN8PdGXbXlKg8GcstWSTViPuRsA/6zqJZ11LXpEFNh4d2mLiwv9vzvYbMnIQHOju8hAQUI/dTnF9wldeeuhO10AfNZhkMeOvyfDOHf57Xl+zhU= 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=s44gGeq9; arc=none smtp.client-ip=209.85.210.179 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="s44gGeq9" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-847921eed4aso1911585b3a.3 for ; Sat, 04 Jul 2026 04:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783164450; x=1783769250; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=EQ2gUxeIt6NcRAiJifRuF+TIWRe9oGJ0XFsRE5fqQJU=; b=s44gGeq9FYbpRlE3Qh/4oAqpAjfyw9l5+l1HcOWBtctXgw7cXEn2lVZB2q7QOIWEob DOfNoE4UoiOFDDk93ZWpPH12KXWcR/FqZH3z7POAZGvkNCsUkySvZtZWZ/UlXNw9mt05 qA6WngJDONMMcbc1dyizzWJPK3x+IgcmrW4mn2a8U02bKWdgX0arR6mIJk+aCUclKlJg tRQucIwEBRELb9claZ3Xcqbu4cAqOCtzKmFzB8GeEt6zX9e2AiR42KIQ8KvXpdpsbDOM MEA/SAqQDacgcJQUo5UhQ8bYfojXbLG/EO4tp0glTVdkqhtquynEO7s5vZuFzADSj+pj g7MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783164450; x=1783769250; h=content-transfer-encoding:mime-version: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=EQ2gUxeIt6NcRAiJifRuF+TIWRe9oGJ0XFsRE5fqQJU=; b=kjWiW7ZmA2gXDuHttEAIwZSbDOfvGVTyIu5EBAOOoQtHvmE1RhwRvWNdQDfYcLWGLB fRmDACr2aqhNxBoVx/ZF2DkfSuQYwm4ZH00w+RdV1xOMNNnIror7uHmw+XKYbudpouFc 8/GvPdoxNbZMp8e4TncWR8hccxTEJEYdjsISWob0jDSVmjF5E8O0XZVVw2w33XyTeXa9 EsD75y10cBeaK3uGQrPMl/DaJQG94NchoWSCbmI++3FDhwOKcKqEMQtDKoI+5YufVHl9 7FEkh/VffuO4FRWy6dn7iXlXka2jEAKOXGPDTe7KXhAl3sarf5vaFFuz3PvQ1XKmcGr8 goxQ== X-Forwarded-Encrypted: i=1; AHgh+Rq0V2s6rJidjhBTCfxHfeeu6nu+fNWELROg1i88TJ7b/NZrEIlGA1kD/oesb6XoSgqy2axq1RkdmBgypgk=@vger.kernel.org X-Gm-Message-State: AOJu0YwnfQna5QSyQP2Di79XFOzSE8Xb+9nSjnzyfEu+seDxNIrWy0ag c5mcp2FwevsLZ1CZhAZdUHKRmV7e7e0r7sCcpn1eT1KtUUMYtCgr745t/vtyYGh3gD8= X-Gm-Gg: AfdE7cm5W+D3i9SKtLyqazXbwCKrqkBBYGyOsgRjLkcBA3YA8QVULm6NTDeS7AAxziw Drh6Qlp6CgJlbPnvpD8gttYNrp1vh5WNk4NwiMuD9bO9pRoMBEm70TBoWnN2uheZvqLN7XoZjD4 Kct1UvkNP/A2kZoqGHdhM46aIJQNqak2aC9QE1qkP77vbFjCgG3jtFO15kN5xYPo/sgkEFaonPM 0XcvA0Os52FBmC2sTIXkn2EZzAdiGaYNrw0zxv2OjUkdFRr3pAJNleL1DtZVmjcewhSrW7mEI+S SfmLpk60AX0IGa9Fw4fl/DWtyrH3tHlsKIdU+oTen+q5kxUpxPx5X87x5cjFpxYmYfI62OoZei4 hgVGJiXccBa7o8S+g9fO8m5PUtp4ahXNrH5XiD7By+nUM9RKzndRCSZzHceRgsdMZSGtJuss= X-Received: by 2002:a05:6a00:2e9a:b0:847:9200:21f8 with SMTP id d2e1a72fcca58-847f6b51320mr3148114b3a.0.1783164449727; Sat, 04 Jul 2026 04:27:29 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1000::f280]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6d7a935sm1113690b3a.47.2026.07.04.04.27.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2026 04:27:29 -0700 (PDT) From: Guangshuo Li To: Andrew Morton , Baoquan He , Mike Rapoport , Pasha Tatashin , Pratyush Yadav , Dave Young , Coiby Xu , kexec@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH v2] crash_dump: release keyring reference at the correct time Date: Sat, 4 Jul 2026 19:25:09 +0800 Message-ID: <20260704112509.3717884-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit restore_dm_crypt_keys_to_thread_keyring() gets a reference to the user keyring before restoring the saved dm-crypt keys. The same keyring reference is then passed to add_key_to_keyring() for each saved key, but add_key_to_keyring() drops that reference on every call. This is only balanced when exactly one key is restored. With multiple keys, the keyring reference is dropped too many times and may trigger a refcount underflow or use-after-free. When more than five keys are restored, a refcount underflow/use-after-free warning can be triggered. The early error paths after lookup_user_key() also return without dropping the keyring reference. Keep ownership of the keyring reference in restore_dm_crypt_keys_to_thread_keyring(), drop it once on all exit paths, and make add_key_to_keyring() only use the reference without consuming it. Fixes: 62f17d9df692 ("crash_dump: retrieve dm crypt keys in kdump kernel") Signed-off-by: Guangshuo Li --- v2: - Mention the refcount underflow/use-after warning seen when restoring more than five keys, as suggested by Coiby Xu. - Order local variables in reverse Christmas tree style. kernel/crash_dump_dm_crypt.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kernel/crash_dump_dm_crypt.c b/kernel/crash_dump_dm_crypt.c index cb875ddb6ba6..c685497cd470 100644 --- a/kernel/crash_dump_dm_crypt.c +++ b/kernel/crash_dump_dm_crypt.c @@ -81,7 +81,6 @@ static int add_key_to_keyring(struct dm_crypt_key *dm_key, kexec_dprintk("Error when adding key"); } - key_ref_put(keyring_ref); return r; } @@ -104,6 +103,7 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) struct dm_crypt_key *key; size_t keys_header_size; key_ref_t keyring_ref; + int ret = 0; u64 addr; /* find the target keyring (which must be writable) */ @@ -118,7 +118,8 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) dm_crypt_keys_read((char *)&key_count, sizeof(key_count), &addr); if (key_count > KEY_NUM_MAX) { kexec_dprintk("Failed to read the number of dm-crypt keys\n"); - return -1; + ret = -1; + goto out; } kexec_dprintk("There are %u keys\n", key_count); @@ -126,8 +127,10 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) keys_header_size = get_keys_header_size(key_count); keys_header = kzalloc(keys_header_size, GFP_KERNEL); - if (!keys_header) - return -ENOMEM; + if (!keys_header) { + ret = -ENOMEM; + goto out; + } dm_crypt_keys_read((char *)keys_header, keys_header_size, &addr); @@ -137,7 +140,9 @@ static int restore_dm_crypt_keys_to_thread_keyring(void) add_key_to_keyring(key, keyring_ref); } - return 0; +out: + key_ref_put(keyring_ref); + return ret; } static int read_key_from_user_keyring(struct dm_crypt_key *dm_key) -- 2.43.0