Skip to content

Commit 2ce3d26

Browse files
committed
Merge bitcoin/bitcoin#26462: wallet: fix crash on loading descriptor wallet containing legacy key type entries
3198e42 test: check that loading descriptor wallet with legacy entries throws error (Sebastian Falbesoner) 349ed2a wallet: throw error if legacy entries are present on loading descriptor wallets (Sebastian Falbesoner) Pull request description: Loading a descriptor wallet currently leads to a segfault if a legacy key type entry is present that can be deserialized successfully and needs SPKman-interaction. To reproduce with a "cscript" entry (see second commit for details): ``` $ ./src/bitcoin-cli createwallet crashme $ ./src/bitcoin-cli unloadwallet crashme $ sqlite3 ~/.bitcoin/wallets/crashme/wallet.dat SQLite version 3.38.2 2022-03-26 13:51:10 Enter ".help" for usage hints. sqlite> INSERT INTO main VALUES(x'07637363726970740000000000000000000000000000000000000000', x'00'); $ ./src/bitcoin-cli loadwallet crashme --- bitcoind output: --- 2022-11-06T13:51:01Z Using SQLite Version 3.38.2 2022-11-06T13:51:01Z Using wallet /home/honey/.bitcoin/wallets/crashme 2022-11-06T13:51:01Z init message: Loading wallet… 2022-11-06T13:51:01Z [crashme] Wallet file version = 10500, last client version = 249900 Segmentation fault (core dumped) ``` Background: In the wallet key-value-loading routine, most legacy type entries require a `LegacyScriptPubKeyMan` instance after successful deserialization. On a descriptor wallet, creating that (via method `GetOrCreateLegacyScriptPubKeyMan`) fails and then leads to a null-pointer dereference crash. E.g. for CSCRIPT: https://github.com/bitcoin/bitcoin/blob/50422b770a40f5fa964201d1e99fd6b5dc1653ca/src/wallet/walletdb.cpp#L589-L594 ~~This PR fixes this by simply ignoring legacy entries if the wallet flags indicate that we have a descriptor wallet. The second commits adds a regression test to the descriptor wallet's functional test (fortunately Python includes sqlite3 support in the standard library).~~ ~~Probably it would be even better to throw a warning to the user if unexpected legacy entries are found in descriptor wallets, but I think as a first mitigation everything is obvisouly better than crashing. As far as I'm aware, descriptor wallets created/migrated by Bitcoin Core should never end up in a state containing legacy type entries though.~~ This PR fixes this by throwing an error if legacy entries are found in descriptor wallets on loading. ACKs for top commit: achow101: ACK 3198e42 aureleoules: ACK 3198e42 Tree-SHA512: ee43da3f61248e0fde55d9a705869202cb83df678ebf4816f0e77263f0beac0d7bae9490465d1753159efb093ee37182931d76b2e2b6e8c6f8761285700ace1c
2 parents 7734a01 + 3198e42 commit 2ce3d26

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

src/wallet/wallet.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2919,6 +2919,10 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
29192919
"The wallet might had been created on a newer version.\n"
29202920
"Please try running the latest software version.\n"), walletFile);
29212921
return nullptr;
2922+
} else if (nLoadWalletRet == DBErrors::UNEXPECTED_LEGACY_ENTRY) {
2923+
error = strprintf(_("Unexpected legacy entry in descriptor wallet found. Loading wallet %s\n\n"
2924+
"The wallet might have been tampered with or created with malicious intent.\n"), walletFile);
2925+
return nullptr;
29222926
} else {
29232927
error = strprintf(_("Error loading %s"), walletFile);
29242928
return nullptr;

src/wallet/walletdb.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ class CWalletScanState {
315315
std::map<uint160, CHDChain> m_hd_chains;
316316
bool tx_corrupt{false};
317317
bool descriptor_unknown{false};
318+
bool unexpected_legacy_entry{false};
318319

319320
CWalletScanState() = default;
320321
};
@@ -332,6 +333,11 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
332333
if (filter_fn && !filter_fn(strType)) {
333334
return true;
334335
}
336+
// Legacy entries in descriptor wallets are not allowed, abort immediately
337+
if (pwallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS) && DBKeys::LEGACY_TYPES.count(strType) > 0) {
338+
wss.unexpected_legacy_entry = true;
339+
return false;
340+
}
335341
if (strType == DBKeys::NAME) {
336342
std::string strAddress;
337343
ssKey >> strAddress;
@@ -833,6 +839,12 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
833839
std::string strType, strErr;
834840
if (!ReadKeyValue(pwallet, ssKey, ssValue, wss, strType, strErr))
835841
{
842+
if (wss.unexpected_legacy_entry) {
843+
strErr = strprintf("Error: Unexpected legacy entry found in descriptor wallet %s. ", pwallet->GetName());
844+
strErr += "The wallet might have been tampered with or created with malicious intent.";
845+
pwallet->WalletLogPrintf("%s\n", strErr);
846+
return DBErrors::UNEXPECTED_LEGACY_ENTRY;
847+
}
836848
// losing keys is considered a catastrophic error, anything else
837849
// we assume the user can live with:
838850
if (IsKeyType(strType) || strType == DBKeys::DEFAULTKEY) {

src/wallet/walletdb.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ enum class DBErrors
5252
LOAD_FAIL,
5353
NEED_REWRITE,
5454
NEED_RESCAN,
55-
UNKNOWN_DESCRIPTOR
55+
UNKNOWN_DESCRIPTOR,
56+
UNEXPECTED_LEGACY_ENTRY
5657
};
5758

5859
namespace DBKeys {

test/functional/wallet_descriptor.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
"""Test descriptor wallet function."""
6+
import os
7+
import sqlite3
68

79
from test_framework.blocktools import COINBASE_MATURITY
810
from test_framework.test_framework import BitcoinTestFramework
@@ -224,5 +226,15 @@ def run_test(self):
224226
imp_addr = imp_rpc.getnewaddress(address_type=addr_type)
225227
assert_equal(exp_addr, imp_addr)
226228

229+
self.log.info("Test that loading descriptor wallet containing legacy key types throws error")
230+
self.nodes[0].createwallet(wallet_name="crashme", descriptors=True)
231+
self.nodes[0].unloadwallet("crashme")
232+
wallet_db = os.path.join(self.nodes[0].datadir, self.chain, "wallets", "crashme", self.wallet_data_filename)
233+
with sqlite3.connect(wallet_db) as conn:
234+
# add "cscript" entry: key type is uint160 (20 bytes), value type is CScript (zero-length here)
235+
conn.execute('INSERT INTO main VALUES(?, ?)', (b'\x07cscript' + b'\x00'*20, b'\x00'))
236+
assert_raises_rpc_error(-4, "Unexpected legacy entry in descriptor wallet found.", self.nodes[0].loadwallet, "crashme")
237+
238+
227239
if __name__ == '__main__':
228240
WalletDescriptorTest().main ()

0 commit comments

Comments
 (0)