summaryrefslogtreecommitdiff
path: root/mail/opensmtpd/files/patch-smtpd-smtp_session.c
diff options
context:
space:
mode:
authorDima Panov <fluffy@FreeBSD.org>2018-05-03 23:17:24 +0000
committerDima Panov <fluffy@FreeBSD.org>2018-05-03 23:17:24 +0000
commit4e17d75935f3f1de8b0fb66b7e07bc0b78ff2fcb (patch)
treead0510167bb2bc95774585439f77f095e5cb6818 /mail/opensmtpd/files/patch-smtpd-smtp_session.c
parent- Add DIALOG4PORTS option (default on) to install it for 'options' command [1]. (diff)
- Prevent OpenSMTPD session hangs and retain a descriptor forever on empty body
(i.e. when the dot appears on the line directly after the headers). This could be used by an attacker to exhaust resources. PR: 227899 Submitted by: grembo Obtained from: OpenSMTPD git repo (backported) MFH: 2018Q2
Diffstat (limited to 'mail/opensmtpd/files/patch-smtpd-smtp_session.c')
-rw-r--r--mail/opensmtpd/files/patch-smtpd-smtp_session.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/mail/opensmtpd/files/patch-smtpd-smtp_session.c b/mail/opensmtpd/files/patch-smtpd-smtp_session.c
new file mode 100644
index 000000000000..990888bf463d
--- /dev/null
+++ b/mail/opensmtpd/files/patch-smtpd-smtp_session.c
@@ -0,0 +1,11 @@
+--- smtpd/smtp_session.c.orig 2018-05-01 13:35:00.375262000 +0000
++++ smtpd/smtp_session.c 2018-05-01 13:37:22.637096000 +0000
+@@ -1345,6 +1345,8 @@
+ s->dataeom = 1;
+ if (iobuf_queued(&s->obuf) == 0)
+ smtp_data_io_done(s);
++ else
++ io_reload(&s->oev);
+ return;
+ }
+