svn commit: r353562 - releng/12.1/sys/kern

[Mark Johnston]

Author: markj
Date: Tue Oct 15 14:45:33 2019
New Revision: 353562
URL: https://svnweb.freebsd.org/changeset/base/353562

Log:
  MFS r353554:
  Fix handling of empty SCM_RIGHTS messages.
  
  Approved by:	re (kib)

Modified:
  releng/12.1/sys/kern/uipc_usrreq.c
Directory Properties:
  releng/12.1/   (props changed)

Modified: releng/12.1/sys/kern/uipc_usrreq.c
==============================================================================
--- releng/12.1/sys/kern/uipc_usrreq.c	Tue Oct 15 14:33:42 2019	(r353561)
+++ releng/12.1/sys/kern/uipc_usrreq.c	Tue Oct 15 14:45:33 2019	(r353562)
@@ -2318,7 +2318,8 @@ unp_internalize(struct mbuf **controlp, struct thread 
 			goto out;
 		}
 
-		controlp = &(*controlp)->m_next;
+		if (*controlp != NULL)
+			controlp = &(*controlp)->m_next;
 		if (CMSG_SPACE(datalen) < clen) {
 			clen -= CMSG_SPACE(datalen);
 			cm = (struct cmsghdr *)