*
* @APPLE_LICENSE_HEADER_START@
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
while (optionEnd > option)
{
- switch (option[0])
- {
- case TCPOPT_EOL:
- option = optionEnd;
+ /* Bounds checking to avoid infinite loops */
+ if (option[0] == TCPOPT_EOL)
+ break;
+
+ if (option[0] == TCPOPT_NOP) {
+ ++option;
+ continue;
+ } else {
+ if (optionEnd - option < 2)
break;
-
- case TCPOPT_NOP:
- ++option;
+ if (option[1] < 2 || option + option[1] >= optionEnd)
break;
+ }
+ switch (option[0])
+ {
case TCPOPT_MAXSEG:
if (option[1] == 4)
{
if (packetAliasMSS < mssVal)
{
int accumulate = mssVal;
+ int accnetorder = 0 ;
+
accumulate -= packetAliasMSS;
*mssPtr = htons(packetAliasMSS);
- ADJUST_CHECKSUM(accumulate, tc->th_sum);
+ accnetorder = htons(accumulate);
+ ADJUST_CHECKSUM(accnetorder, tc->th_sum);
}
option = optionEnd;