Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
00a93b19
Commit
00a93b19
authored
6 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.3.5' into maint-0.4.0
parents
df3484b2
4a8a1f76
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/ticket29168
+5
-0
5 additions, 0 deletions
changes/ticket29168
src/core/or/scheduler_kist.c
+1
-1
1 addition, 1 deletion
src/core/or/scheduler_kist.c
with
6 additions
and
1 deletion
changes/ticket29168
0 → 100644
+
5
−
0
View file @
00a93b19
o Major bugfixes (cell scheduler, KIST):
- Make KIST to always take into account the outbuf length when computing
what we can actually put in the outbuf. This could lead to the outbuf
being filled up and thus a possible memory DoS vector. TROVE-2019-001.
Fixes bug 29168; bugfix on 0.3.2.1-alpha.
This diff is collapsed.
Click to expand it.
src/core/or/scheduler_kist.c
+
1
−
1
View file @
00a93b19
...
...
@@ -286,7 +286,7 @@ update_socket_info_impl, (socket_table_ent_t *ent))
extra_space
=
clamp_double_to_int64
(
(
ent
->
cwnd
*
(
int64_t
)
ent
->
mss
)
*
sock_buf_size_factor
)
-
ent
->
notsent
;
ent
->
notsent
-
(
int64_t
)
channel_outbuf_length
((
channel_t
*
)
ent
->
chan
)
;
if
((
tcp_space
+
extra_space
)
<
0
)
{
/* This means that the "notsent" queue is just too big so we shouldn't put
* more in the kernel for now. */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment