Module Name: src
Committed By: mlelstv
Date: Sun Nov 17 08:21:25 UTC 2019
Modified Files:
src/sys/netinet: tcp_output.c
Log Message:
Don't allow zero sized segments that will panic the stack.
Reported-by: [email protected]
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/sys/netinet/tcp_output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.211 src/sys/netinet/tcp_output.c:1.212
--- src/sys/netinet/tcp_output.c:1.211 Mon Feb 25 10:49:16 2019
+++ src/sys/netinet/tcp_output.c Sun Nov 17 08:21:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_output.c,v 1.211 2019/02/25 10:49:16 maxv Exp $ */
+/* $NetBSD: tcp_output.c,v 1.212 2019/11/17 08:21:25 mlelstv Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.211 2019/02/25 10:49:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.212 2019/11/17 08:21:25 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -252,6 +252,7 @@ tcp_segsize(struct tcpcb *tp, int *txseg
break;
#endif
default:
+ hdrlen = 1; /* prevent zero sized segments */
goto out;
}
@@ -386,6 +387,13 @@ tcp_segsize(struct tcpcb *tp, int *txseg
*txsegsizep = uimin(so->so_snd.sb_hiwat >> 1, *txsegsizep);
}
+ /*
+ * A segment must at least store header + options
+ */
+ if (*txsegsizep < hdrlen + optlen) {
+ return EMSGSIZE;
+ }
+
if (*txsegsizep != tp->t_segsz) {
/*
* If the new segment size is larger, we don't want to
