svn commit: r235179 - stable/8/sys/netinet
Michael Tuexen
tuexen at FreeBSD.org
Wed May 9 14:44:37 UTC 2012
Author: tuexen
Date: Wed May 9 14:44:36 2012
New Revision: 235179
URL: http://svn.freebsd.org/changeset/base/235179
Log:
MFC r234832:
Add support for missing gauth_number_of_chunks field. This Bug was
found by Irene Ruengeler.
Modified:
stable/8/sys/netinet/sctp_uio.h
stable/8/sys/netinet/sctp_usrreq.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/netinet/sctp_uio.h
==============================================================================
--- stable/8/sys/netinet/sctp_uio.h Wed May 9 14:35:19 2012 (r235178)
+++ stable/8/sys/netinet/sctp_uio.h Wed May 9 14:44:36 2012 (r235179)
@@ -660,6 +660,7 @@ struct sctp_authkeyid {
/* SCTP_PEER_AUTH_CHUNKS / SCTP_LOCAL_AUTH_CHUNKS */
struct sctp_authchunks {
sctp_assoc_t gauth_assoc_id;
+ uint32_t gauth_number_of_chunks;
uint8_t gauth_chunks[];
};
Modified: stable/8/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/8/sys/netinet/sctp_usrreq.c Wed May 9 14:35:19 2012 (r235178)
+++ stable/8/sys/netinet/sctp_usrreq.c Wed May 9 14:44:36 2012 (r235179)
@@ -2868,6 +2868,7 @@ flags_out:
} else {
/* copy in the chunks */
(void)sctp_serialize_auth_chunks(chklist, sac->gauth_chunks);
+ sac->gauth_number_of_chunks = (uint32_t) size;
*optsize = sizeof(struct sctp_authchunks) + size;
}
SCTP_TCB_UNLOCK(stcb);
@@ -2886,6 +2887,7 @@ flags_out:
} else {
/* copy in the chunks */
(void)sctp_serialize_auth_chunks(chklist, sac->gauth_chunks);
+ sac->gauth_number_of_chunks = (uint32_t) size;
*optsize = sizeof(struct sctp_authchunks) + size;
}
SCTP_INP_RUNLOCK(inp);
@@ -2916,6 +2918,7 @@ flags_out:
} else {
/* copy in the chunks */
(void)sctp_serialize_auth_chunks(chklist, sac->gauth_chunks);
+ sac->gauth_number_of_chunks = (uint32_t) size;
*optsize = sizeof(struct sctp_authchunks) + size;
}
SCTP_TCB_UNLOCK(stcb);
More information about the svn-src-stable-8
mailing list