Skip to content

fix: null-deref when dbgKey unset under HELIB_DEBUG (#501) #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BAder82t wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: null-deref when dbgKey unset under HELIB_DEBUG (#501) #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Ctxt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,10 @@ void Ctxt::multiplyBy(const Ctxt& other)
this->multLowLvl(other); // perform the multiplication
reLinearize(); // re-linearize
#ifdef HELIB_DEBUG
checkNoise(*this, *dbgKey, "reLinearize " + std::to_string(size_t(this)));
// Skip when setupDebugGlobals() was not called; dereferencing a null
// dbgKey here previously caused a segfault (issue #501).
if (dbgKey)
checkNoise(*this, *dbgKey, "reLinearize " + std::to_string(size_t(this)));
#endif
}

Expand Down
51 changes: 30 additions & 21 deletions src/binaryArith.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,15 +1008,18 @@ static void multByNegative(CtPtrs& product,

CtPtrMat_VecCt nums(numbers); // Wrapper around numbers
#ifdef HELIB_DEBUG
long pa, pb;
std::vector<long> slots;
decryptBinaryNums(slots, a, *dbgKey, *dbgEa, false);
pa = slots[0];
decryptBinaryNums(slots, b, *dbgKey, *dbgEa, true);
pb = slots[0];
decryptAndSum((std::cout << " multByNegative: " << pa << '*' << pb << " = "),
nums,
true);
if (dbgKey && dbgEa) {
long pa, pb;
std::vector<long> slots;
decryptBinaryNums(slots, a, *dbgKey, *dbgEa, false);
pa = slots[0];
decryptBinaryNums(slots, b, *dbgKey, *dbgEa, true);
pb = slots[0];
decryptAndSum(
(std::cout << " multByNegative: " << pa << '*' << pb << " = "),
nums,
true);
}
#endif
addManyNumbers(product, nums, resSize, unpackSlotEncoding);
}
Expand Down Expand Up @@ -1107,16 +1110,18 @@ void multTwoNumbers(CtPtrs& product,

CtPtrMat_VecCt nums(numbers); // A wrapper around numbers
#ifdef HELIB_DEBUG
long plaintext_lhs, plaintext_rhs;
std::vector<long> slots;
decryptBinaryNums(slots, lhs, *dbgKey, *dbgEa, false);
plaintext_lhs = slots[0];
decryptBinaryNums(slots, rhs, *dbgKey, *dbgEa, false);
plaintext_rhs = slots[0];
decryptAndSum((std::cout << " multTwoNumbers: " << plaintext_lhs << '*'
<< plaintext_rhs << " = "),
nums,
false);
if (dbgKey && dbgEa) {
long plaintext_lhs, plaintext_rhs;
std::vector<long> slots;
decryptBinaryNums(slots, lhs, *dbgKey, *dbgEa, false);
plaintext_lhs = slots[0];
decryptBinaryNums(slots, rhs, *dbgKey, *dbgEa, false);
plaintext_rhs = slots[0];
decryptAndSum((std::cout << " multTwoNumbers: " << plaintext_lhs << '*'
<< plaintext_rhs << " = "),
nums,
false);
}
#endif
addManyNumbers(product, nums, resSize, unpackSlotEncoding);
}
Expand Down Expand Up @@ -1402,7 +1407,7 @@ void AddDAG::printAddDAG(bool printCT)
if (node->parent1)
std::cout << ", prnt1=" << node->parent1->nodeName();
std::cout << " }\n";
if (printCT && node->ct != nullptr)
if (printCT && node->ct != nullptr && dbgKey && dbgEa)
decryptAndPrint(std::cout,
*(node->ct),
*dbgKey,
Expand Down Expand Up @@ -1430,7 +1435,7 @@ void AddDAG::printAddDAG(bool printCT)
if (node->parent1)
std::cout << ", prnt1=" << node->parent1->nodeName();
std::cout << " }\n";
if (printCT && node->ct != nullptr)
if (printCT && node->ct != nullptr && dbgKey && dbgEa)
decryptAndPrint(std::cout,
*(node->ct),
*dbgKey,
Expand All @@ -1445,6 +1450,10 @@ void decryptAndSum(std::ostream& s,
const CtPtrMat& numbers,
bool twosComplement)
{
if (!dbgKey || !dbgEa) {
s << "(skipped: debug globals not set)" << std::endl;
return;
}
s << "sum(";
long sum = 0;
for (long i = 0; i < numbers.size(); i++) {
Expand Down
66 changes: 35 additions & 31 deletions src/binaryCompare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,27 @@ static void compProducts(const CtPtrs_slice& e, const CtPtrs_slice& g)
}
NTL_EXEC_RANGE_END
#ifdef HELIB_DEBUG
std::cout << " g[" << g.start << ".." << (g.start + g.sz - 1) << "], "
<< " e[" << e.start << ".." << (e.start + e.sz - 1)
<< "]:" << std::endl;
for (long i = 0; i < g.size(); i++)
decryptAndPrint((std::cout << " g[" << (i + g.start) << "] ("
<< ((void*)g[i]) << "): "),
*g[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
for (long i = 0; i < e.size(); i++)
decryptAndPrint((std::cout << " e[" << (i + e.start) << "] ("
<< ((void*)e[i]) << "): "),
*e[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
if (dbgKey && dbgEa) {
std::cout << " g[" << g.start << ".." << (g.start + g.sz - 1) << "], "
<< " e[" << e.start << ".." << (e.start + e.sz - 1)
<< "]:" << std::endl;
for (long i = 0; i < g.size(); i++)
decryptAndPrint((std::cout << " g[" << (i + g.start) << "] ("
<< ((void*)g[i]) << "): "),
*g[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
for (long i = 0; i < e.size(); i++)
decryptAndPrint((std::cout << " e[" << (i + e.start) << "] ("
<< ((void*)e[i]) << "): "),
*e[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);

std::cout << std::endl;
std::cout << std::endl;
}
#endif
}

Expand Down Expand Up @@ -141,19 +143,21 @@ static void compEqGt(CtPtrs& aeqb,
HELIB_NTIMER_STOP(compEqGt2);

#ifdef HELIB_DEBUG
for (long i = 0; i < lsize(b); i++)
decryptAndPrint((std::cout << " e[" << i << "]: "),
*aeqb[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
for (long i = 0; i < lsize(a); i++)
decryptAndPrint((std::cout << " ag[" << i << "]: "),
*agtb[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
std::cout << std::endl;
if (dbgKey && dbgEa) {
for (long i = 0; i < lsize(b); i++)
decryptAndPrint((std::cout << " e[" << i << "]: "),
*aeqb[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
for (long i = 0; i < lsize(a); i++)
decryptAndPrint((std::cout << " ag[" << i << "]: "),
*agtb[i],
*dbgKey,
*dbgEa,
FLAG_PRINT_POLY);
std::cout << std::endl;
}
#endif

// Call a recursive function to compute:
Expand Down