svn commit: r351973 - stable/12/sys/kern

[Michael Tuexen]

Author: tuexen
Date: Sat Sep  7 10:49:37 2019
New Revision: 351973
URL: https://svnweb.freebsd.org/changeset/base/351973

Log:
  MFC r349989:
  
  Improve the input validation for l_linger.
  When using the SOL_SOCKET level socket option SO_LINGER, the structure
  struct linger is used as the option value. The component l_linger is of
  type int, but internally copied to the field so_linger of the structure
  struct socket. The type of so_linger is short, but it is assumed to be
  non-negative and the value is used to compute ticks to be stored in a
  variable of type int.
  
  Therefore, perform input validation on l_linger similar to the one
  performed by NetBSD and OpenBSD.
  
  Thanks to syzkaller for making me aware of this issue.
  
  Thanks to markj@ for pointing out that a similar check should be added
  to so_linger_set().
  
  Reviewed by:		markj@
  Differential Revision:	https://reviews.freebsd.org/D20948

Modified:
  stable/12/sys/kern/uipc_socket.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/uipc_socket.c
==============================================================================
--- stable/12/sys/kern/uipc_socket.c	Sat Sep  7 10:47:43 2019	(r351972)
+++ stable/12/sys/kern/uipc_socket.c	Sat Sep  7 10:49:37 2019	(r351973)
@@ -2774,7 +2774,12 @@ sosetopt(struct socket *so, struct sockopt *sopt)
 			error = sooptcopyin(sopt, &l, sizeof l, sizeof l);
 			if (error)
 				goto bad;
-
+			if (l.l_linger < 0 ||
+			    l.l_linger > USHRT_MAX ||
+			    l.l_linger > (INT_MAX / hz)) {
+				error = EDOM;
+				goto bad;
+			}
 			SOCK_LOCK(so);
 			so->so_linger = l.l_linger;
 			if (l.l_onoff)
@@ -4103,6 +4108,9 @@ so_linger_get(const struct socket *so)
 void
 so_linger_set(struct socket *so, int val)
 {
+
+	KASSERT(val >= 0 && val <= USHRT_MAX && val <= (INT_MAX / hz),
+	    ("%s: val %d out of range", __func__, val));
 
 	so->so_linger = val;
 }