D14623.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14623.diff
View Options

	Index: head/sys/netipsec/xform_tcp.c
	===================================================================
	--- head/sys/netipsec/xform_tcp.c
	+++ head/sys/netipsec/xform_tcp.c
	@@ -80,23 +80,24 @@
	struct tcpcb *tp;
	int error, optval;

	- INP_WLOCK_ASSERT(inp);
	if (sopt->sopt_name != TCP_MD5SIG) {
	- INP_WUNLOCK(inp);
	return (ENOPROTOOPT);
	}

	- tp = intotcpcb(inp);
	if (sopt->sopt_dir == SOPT_GET) {
	+ INP_RLOCK(inp);
	+ if (inp->inp_flags & (INP_TIMEWAIT \| INP_DROPPED)) {
	+ INP_RUNLOCK(inp);
	+ return (ECONNRESET);
	+ }
	+ tp = intotcpcb(inp);
	optval = (tp->t_flags & TF_SIGNATURE) ? 1 : 0;
	- INP_WUNLOCK(inp);
	+ INP_RUNLOCK(inp);

	/* On success return with released INP_WLOCK */
	return (sooptcopyout(sopt, &optval, sizeof(optval)));
	}

	- INP_WUNLOCK(inp);
	-
	error = sooptcopyin(sopt, &optval, sizeof(optval), sizeof(optval));
	if (error != 0)
	return (error);
	@@ -107,12 +108,13 @@
	INP_WUNLOCK(inp);
	return (ECONNRESET);
	}
	+ tp = intotcpcb(inp);
	if (optval > 0)
	tp->t_flags \|= TF_SIGNATURE;
	else
	tp->t_flags &= ~TF_SIGNATURE;

	- /* On success return with acquired INP_WLOCK */
	+ INP_WUNLOCK(inp);
	return (error);
	}