Author: tuexen
Date: Mon May  7 10:46:26 2012
New Revision: 235123
URL: http://svn.freebsd.org/changeset/base/235123

Log:
  MFC r234832:
  Add support for missing gauth_number_of_chunks field. This Bug was
  found by Irene Ruengeler.

Modified:
  stable/9/sys/netinet/sctp_uio.h
  stable/9/sys/netinet/sctp_usrreq.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_uio.h
==============================================================================
--- stable/9/sys/netinet/sctp_uio.h     Mon May  7 09:00:30 2012        
(r235122)
+++ stable/9/sys/netinet/sctp_uio.h     Mon May  7 10:46:26 2012        
(r235123)
@@ -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/9/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/9/sys/netinet/sctp_usrreq.c  Mon May  7 09:00:30 2012        
(r235122)
+++ stable/9/sys/netinet/sctp_usrreq.c  Mon May  7 10:46:26 2012        
(r235123)
@@ -2879,6 +2879,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);
@@ -2897,6 +2898,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);
@@ -2927,6 +2929,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to