Merge pull request #1414

3b005275 ringct: add sc_check calls in MLSAG_Ver for ss and cc (moneromooo-monero)
2f1732a7 ringct: guard against bad data exceptions in worker threads (moneromooo-monero)

1 files changed, 19 insertions, 0 deletions

diff --git a/src/ringct/rctSigs.cpp b/src/ringct/rctSigs.cpp
index fd068c4ea..b7efe3ae7 100644
--- a/src/ringct/rctSigs.cpp
+++ b/src/ringct/rctSigs.cpp
@@ -231,6 +231,11 @@ namespace rct {
         }
         CHECK_AND_ASSERT_MES(dsRows <= rows, false, "Bad dsRows value");
 
+        for (size_t i = 0; i < rv.ss.size(); ++i)
+          for (size_t j = 0; j < rv.ss[i].size(); ++j)
+            CHECK_AND_ASSERT_MES(sc_check(rv.ss[i][j].bytes) == 0, false, "Bad ss slot");
+        CHECK_AND_ASSERT_MES(sc_check(rv.cc.bytes) == 0, false, "Bad cc");
+
         size_t i = 0, j = 0, ii = 0;
         key c,  L, R, Hi;
         key c_old = copy(rv.cc);
@@ -307,6 +312,8 @@ namespace rct {
     //   mask is a such that C = aG + bH, and b = amount
     //verRange verifies that \sum Ci = C and that each Ci is a commitment to 0 or 2^i
     bool verRange(const key & C, const rangeSig & as) {
+      try
+      {
         PERF_TIMER(verRange);
         key64 CiH;
         int i = 0;
@@ -320,6 +327,9 @@ namespace rct {
         if (!verifyBorromean(as.asig, as.Ci, CiH))
           return false;
         return true;
+      }
+      // we can get deep throws from ge_frombytes_vartime if input isn't valid
+      catch (...) { return false; }
     }
 
     key get_pre_mlsag_hash(const rctSig &rv)
@@ -485,6 +495,8 @@ namespace rct {
     //This does a simplified version, assuming only post Rct
     //inputs
     bool verRctMGSimple(const key &message, const mgSig &mg, const ctkeyV & pubs, const key & C) {
+        try
+        {
             PERF_TIMER(verRctMGSimple);
             //setup vars
             size_t rows = 1;
@@ -500,6 +512,8 @@ namespace rct {
             }
             //DP(C);
             return MLSAG_Ver(message, M, mg, rows);
+        }
+        catch (...) { return false; }
     }
 
 
@@ -762,6 +776,8 @@ namespace rct {
     //ver RingCT simple
     //assumes only post-rct style inputs (at least for max anonymity)
     bool verRctSimple(const rctSig & rv) {
+      try
+      {
         PERF_TIMER(verRctSimple);
 
         CHECK_AND_ASSERT_MES(rv.type == RCTTypeSimple, false, "verRctSimple called on non simple rctSig");
@@ -832,6 +848,9 @@ namespace rct {
         }
 
         return true;
+      }
+      // we can get deep throws from ge_frombytes_vartime if input isn't valid
+      catch (...) { return false; }
     }
 
     //RingCT protocol