Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(786)

Unified Diff: mojo/public/cpp/bindings/lib/validation_context.h

Issue 2312813002: Limit Mojo messages recursion depth (Closed)
Patch Set: Address more review comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/public/cpp/bindings/lib/validation_context.h
diff --git a/mojo/public/cpp/bindings/lib/validation_context.h b/mojo/public/cpp/bindings/lib/validation_context.h
index 55d083cffe97691d6cc87a64adc447b63e077c7f..1a49cd11d2d3fc0ef91eb14e87401537015420ba 100644
--- a/mojo/public/cpp/bindings/lib/validation_context.h
+++ b/mojo/public/cpp/bindings/lib/validation_context.h
@@ -8,10 +8,13 @@
#include <stddef.h>
#include <stdint.h>
+#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/strings/string_piece.h"
#include "mojo/public/cpp/bindings/lib/bindings_internal.h"
+static const int kMaxRecursionDepth = 100;
+
namespace mojo {
class Message;
@@ -33,7 +36,8 @@ class ValidationContext {
size_t data_num_bytes,
size_t num_handles,
Message* message = nullptr,
- const base::StringPiece& description = "");
+ const base::StringPiece& description = "",
+ int stack_depth = 0);
~ValidationContext();
@@ -81,6 +85,29 @@ class ValidationContext {
return InternalIsValidRange(begin, end);
}
+ // This object should be created on the stack once every time we recurse down
+ // into a subfield during validation to make sure we don't recurse too deep
+ // and blow the stack.
+ class ScopedDepthTracker {
+ public:
+ // |ctx| must outlive this object.
+ explicit ScopedDepthTracker(ValidationContext* ctx) : ctx_(ctx) {
+ ++ctx_->stack_depth_;
+ }
+
+ ~ScopedDepthTracker() { --ctx_->stack_depth_; }
+
+ private:
+ ValidationContext* ctx_;
+
+ DISALLOW_COPY_AND_ASSIGN(ScopedDepthTracker);
+ };
+
+ // Returns true if the recursion depth limit has been reached.
+ bool ExceedsMaxDepth() WARN_UNUSED_RESULT {
+ return stack_depth_ > kMaxRecursionDepth;
+ }
+
Message* message() const { return message_; }
const base::StringPiece& description() const { return description_; }
@@ -100,6 +127,8 @@ class ValidationContext {
uint32_t handle_begin_;
uint32_t handle_end_;
+ int stack_depth_;
+
DISALLOW_COPY_AND_ASSIGN(ValidationContext);
};

Powered by Google App Engine
This is Rietveld 408576698