diff options
| author | Vladislav Grishenko <themiron@users.noreply.github.com> | 2020-06-15 18:22:18 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 21:22:18 +0800 |
| commit | 2301b6ac0ba733ea95d723630bbb610195d1527a (patch) | |
| tree | 22eb92d2925dbf58fcb8c5d33d59d03277b5f303 /common-session.c | |
| parent | a27e8b053e520117b20993b8e51103c5bd22da8c (diff) | |
Disallow leading lines before the ident for server (#102)
Per RFC4253 4.2 clients must be able to process other lines of data
before the version string, server behavior is not defined neither
with MUST/SHOULD nor with MAY.
If server process up to 50 lines too - it may cause too long hanging
session with invalid/evil client that consume host resources and
potentially may lead to DDoS on poor embedded boxes.
Let's require first line from client to be version string and fail
early if it's not - matches both RFC and real OpenSSH behavior.
Diffstat (limited to 'common-session.c')
| -rw-r--r-- | common-session.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common-session.c b/common-session.c index fc0f9a0..7531563 100644 --- a/common-session.c +++ b/common-session.c @@ -370,8 +370,11 @@ static void read_session_identification() { int len = 0; char done = 0; int i; - /* If they send more than 50 lines, something is wrong */ - for (i = 0; i < 50; i++) { + + /* Servers may send other lines of data before sending the + * version string, client must be able to process such lines. + * If they send more than 50 lines, something is wrong */ + for (i = IS_DROPBEAR_CLIENT ? 50 : 1; i > 0; i--) { len = ident_readln(ses.sock_in, linebuf, sizeof(linebuf)); if (len < 0 && errno != EINTR) { |