svn commit: r343790 - releng/12.0/sys/kern

[Ed Maste]

Author: emaste
Date: Tue Feb  5 18:11:15 2019
New Revision: 343790
URL: https://svnweb.freebsd.org/changeset/base/343790

Log:
  MFS12 r343785: Avoid leaking fp references when truncating SCM_RIGHTS
  
  control messages.
  
  Submitted by:	markj
  Approved by:	so
  Security:	CVE-2019-5596

Modified:
  releng/12.0/sys/kern/uipc_syscalls.c
Directory Properties:
  releng/12.0/   (props changed)

Modified: releng/12.0/sys/kern/uipc_syscalls.c
==============================================================================
--- releng/12.0/sys/kern/uipc_syscalls.c	Tue Feb  5 18:07:45 2019	(r343789)
+++ releng/12.0/sys/kern/uipc_syscalls.c	Tue Feb  5 18:11:15 2019	(r343790)
@@ -1607,8 +1607,10 @@ m_dispose_extcontrolm(struct mbuf *m)
 					fd = *fds++;
 					error = fget(td, fd, &cap_no_rights,
 					    &fp);
-					if (error == 0)
+					if (error == 0) {
 						fdclose(td, fp, fd);
+						fdrop(fp, td);
+					}
 				}
 			}
 			clen -= datalen;