[Git][debian-proftpd-team/proftpd][master] CVE-2019-18217

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
95c4b3af by Hilmar Preuße at 2019-10-22T12:14:15Z
CVE-2019-18217

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/issue_846_CVE-2019-18217.diff
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+proftpd-dfsg (1.3.6a-2) unstable; urgency=high
+
+  * Add patch for upstream bug #846 (CVE-2019-18217).
+    (Closes: #942831)
+
+ -- Hilmar Preusse <hille42 at web.de>  Tue, 22 Oct 2019 13:30:36 +0200
+
 proftpd-dfsg (1.3.6a-1) unstable; urgency=medium
 
   * New upstream patch release. Obsoletes patches included in upstream:


=====================================
debian/patches/issue_846_CVE-2019-18217.diff
=====================================
@@ -0,0 +1,56 @@
+From 13fe9462787b9a551152162f46f1641d65fe4df4 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj at castaglia.org>
+Date: Sat, 19 Oct 2019 12:37:56 -0700
+Subject: [PATCH] Issue #846: Handle the case where a client tries to send
+ too-large commands in an effort to DoS the server.
+
+---
+ src/main.c  | 10 +++++++++-
+ src/netio.c |  3 ++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+--- proftpd-dfsg.orig/src/main.c
++++ proftpd-dfsg/src/main.c
+@@ -462,6 +462,7 @@
+   static long cmd_bufsz = -1;
+   static char *cmd_buf = NULL;
+   int cmd_buflen;
++  unsigned int too_large_count = 0;
+   char *ptr;
+ 
+   if (res == NULL) {
+@@ -487,8 +488,15 @@
+     if (cmd_buflen < 0) {
+       if (errno == E2BIG) {
+         /* The client sent a too-long command which was ignored; give
+-         * them another chance?
++         * them a few more chances, with minor delays?
+          */
++        too_large_count++;
++        pr_timer_usleep(250 * 1000);
++
++        if (too_large_count > 3) {
++          return -1;
++        }
++
+         continue;
+       }
+ 
+--- proftpd-dfsg.orig/src/netio.c
++++ proftpd-dfsg/src/netio.c
+@@ -1,6 +1,6 @@
+ /*
+  * ProFTPD - FTP server daemon
+- * Copyright (c) 2001-2016 The ProFTPD Project team
++ * Copyright (c) 2001-2019 The ProFTPD Project team
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -1446,6 +1446,7 @@
+       }
+ 
+       nstrm->strm_errno = 0;
++      errno = EOF;
+       break;
+     }
+ 


=====================================
debian/patches/series
=====================================
@@ -19,3 +19,4 @@ wrong-path-for-interpreter_perl.diff
 # github_pr_594
 # upstream_pull_567
 # upstream_4372_CVE-2019-12815.diff
+issue_846_CVE-2019-18217.diff



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/95c4b3afa71e15def5e0009218856c9b729037a7

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/95c4b3afa71e15def5e0009218856c9b729037a7
You're receiving this email because of your account on salsa.debian.org.