svn commit: r231497 - stable/8/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Sat Feb 11 01:07:51 UTC 2012
Author: tuexen
Date: Sat Feb 11 01:07:51 2012
New Revision: 231497
URL: http://svn.freebsd.org/changeset/base/231497
Log:
MFC r230104:
Fix two bugs, which result in a panic when calling getsockopt()
using SCTP_RECVINFO or SCTP_NXTINFO.
Reported by Clement Lecigne and forwarded to us by zi at .
Modified:
stable/8/sys/netinet/sctp_usrreq.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
Modified: stable/8/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/8/sys/netinet/sctp_usrreq.c Sat Feb 11 01:05:41 2012 (r231496)
+++ stable/8/sys/netinet/sctp_usrreq.c Sat Feb 11 01:07:51 2012 (r231497)
@@ -3008,7 +3008,7 @@ flags_out:
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
} else {
- SCTP_INP_RUNLOCK(inp);
+ SCTP_INP_RLOCK(inp);
onoff = sctp_is_feature_on(inp, SCTP_PCB_FLAGS_RECVRCVINFO);
SCTP_INP_RUNLOCK(inp);
}
@@ -3027,7 +3027,7 @@ flags_out:
SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL);
error = EINVAL;
} else {
- SCTP_INP_RUNLOCK(inp);
+ SCTP_INP_RLOCK(inp);
onoff = sctp_is_feature_on(inp, SCTP_PCB_FLAGS_RECVNXTINFO);
SCTP_INP_RUNLOCK(inp);
}
More information about the svn-src-all
mailing list