D26298.id76544.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26298.id76544.diff
View Options

	Index: sys/kern/uipc_usrreq.c
	===================================================================
	--- sys/kern/uipc_usrreq.c
	+++ sys/kern/uipc_usrreq.c
	@@ -1554,7 +1554,8 @@
	unp_connectat(int fd, struct socket so, struct sockaddr nam,
	struct thread *td)
	{
	- struct sockaddr_un soun = (struct sockaddr_un )nam;
	+ struct mtx *vplock;
	+ struct sockaddr_un *soun;
	struct vnode *vp;
	struct socket *so2;
	struct unpcb unp, unp2, *unp3;
	@@ -1563,7 +1564,7 @@
	struct sockaddr *sa;
	cap_rights_t rights;
	int error, len, freed;
	- struct mtx *vplock;
	+ bool connreq;

	if (nam->sa_family != AF_UNIX)
	return (EAFNOSUPPORT);
	@@ -1572,6 +1573,7 @@
	len = nam->sa_len - offsetof(struct sockaddr_un, sun_path);
	if (len <= 0)
	return (EINVAL);
	+ soun = (struct sockaddr_un *)nam;
	bcopy(soun->sun_path, buf, len);
	buf[len] = 0;

	@@ -1584,7 +1586,11 @@
	unp->unp_flags \|= UNP_CONNECTING;
	UNP_PCB_UNLOCK(unp);

	- sa = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);
	+ connreq = (so->so_proto->pr_flags & PR_CONNREQUIRED) != 0;
	+ if (connreq)
	+ sa = malloc(sizeof(struct sockaddr_un), M_SONAME, M_WAITOK);
	+ else
	+ sa = NULL;
	NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW \| LOCKSHARED \| LOCKLEAF,
	UIO_SYSSPACE, buf, fd, cap_rights_init(&rights, CAP_CONNECTAT), td);
	error = namei(&nd);
	@@ -1625,7 +1631,7 @@
	error = EPROTOTYPE;
	goto bad2;
	}
	- if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
	+ if (connreq) {
	if (so2->so_options & SO_ACCEPTCONN) {
	CURVNET_SET(so2->so_vnet);
	so2 = sonewconn(so2, 0);