Date: Sat, 16 Jan 2016 18:18:47 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r294186 - stable/10/sys/netinet Message-ID: <201601161818.u0GIIlLi060429@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Sat Jan 16 18:18:47 2016 New Revision: 294186 URL: https://svnweb.freebsd.org/changeset/base/294186 Log: MFC r291140: Revert part of r291137 which seems correct, bit does not fix the resource problem I'm currently hunting down. Modified: stable/10/sys/netinet/sctp_pcb.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet/sctp_pcb.c ============================================================================== --- stable/10/sys/netinet/sctp_pcb.c Sat Jan 16 18:15:41 2016 (r294185) +++ stable/10/sys/netinet/sctp_pcb.c Sat Jan 16 18:18:47 2016 (r294186) @@ -3644,11 +3644,13 @@ sctp_inpcb_free(struct sctp_inpcb *inp, * macro here since le_next will get freed as part of the * sctp_free_assoc() call. */ + if (so) { #ifdef IPSEC - if (ip_pcb->inp_sp != NULL) { ipsec_delete_pcbpolicy(ip_pcb); +#endif /* IPSEC */ + + /* Unlocks not needed since the socket is gone now */ } -#endif if (ip_pcb->inp_options) { (void)sctp_m_free(ip_pcb->inp_options); ip_pcb->inp_options = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601161818.u0GIIlLi060429>