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

[Ed Maste]

Author: emaste
Date: Tue Aug 20 17:45:22 2019
New Revision: 351255
URL: https://svnweb.freebsd.org/changeset/base/351255

Log:
  MFC r351254: mqueuefs: fix compat32 struct file leak
  
  In a compat32 error case we previously leaked a struct file.
  
  Submitted by:	Karsten König, Secfault Security
  Security:	CVE-2019-5603

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

Modified: stable/12/sys/kern/uipc_mqueue.c
==============================================================================
--- stable/12/sys/kern/uipc_mqueue.c	Tue Aug 20 17:44:03 2019	(r351254)
+++ stable/12/sys/kern/uipc_mqueue.c	Tue Aug 20 17:45:22 2019	(r351255)
@@ -2798,7 +2798,7 @@ freebsd32_kmq_timedsend(struct thread *td,
 	if (uap->abs_timeout != NULL) {
 		error = copyin(uap->abs_timeout, &ets32, sizeof(ets32));
 		if (error != 0)
-			return (error);
+			goto out;
 		CP(ets32, ets, tv_sec);
 		CP(ets32, ets, tv_nsec);
 		abs_timeout = &ets;
@@ -2807,6 +2807,7 @@ freebsd32_kmq_timedsend(struct thread *td,
 	waitok = !(fp->f_flag & O_NONBLOCK);
 	error = mqueue_send(mq, uap->msg_ptr, uap->msg_len,
 		uap->msg_prio, waitok, abs_timeout);
+out:
 	fdrop(fp, td);
 	return (error);
 }