svn commit: r343786 - stable/11/sys/kern

[Mark Johnston]

Author: markj
Date: Tue Feb  5 17:57:30 2019
New Revision: 343786
URL: https://svnweb.freebsd.org/changeset/base/343786

Log:
  MFC r343784:
  Avoid leaking fp references when truncating SCM_RIGHTS control messages.
  
  Approved by:	so
  Security:	CVE-2019-5596

Modified:
  stable/11/sys/kern/uipc_syscalls.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/uipc_syscalls.c
==============================================================================
--- stable/11/sys/kern/uipc_syscalls.c	Tue Feb  5 17:56:22 2019	(r343785)
+++ stable/11/sys/kern/uipc_syscalls.c	Tue Feb  5 17:57:30 2019	(r343786)
@@ -1831,8 +1831,10 @@ m_dispose_extcontrolm(struct mbuf *m)
 					fd = *fds++;
 					error = fget(td, fd,
 					    cap_rights_init(&rights), &fp);
-					if (error == 0)
+					if (error == 0) {
 						fdclose(td, fp, fd);
+						fdrop(fp, td);
+					}
 				}
 			}
 			clen -= datalen;