Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't assume alignment of sack options.

Browse Source
This commit is contained in:
yamt 2005-03-06 23:05:56 +00:00
parent 1152380a6b
commit fd5005e8d7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet/tcp_sack.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_sack.c,v 1.2 2005/03/06 23:05:20 yamt Exp $ */ /* $NetBSD: tcp_sack.c,v 1.3 2005/03/06 23:05:56 yamt Exp $ */
/* /*
* Copyright (c) 2005 The NetBSD Foundation, Inc. * Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -109,7 +109,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.2 2005/03/06 23:05:20 yamt Exp $"); __KERNEL_RCSID(0, "$NetBSD: tcp_sack.c,v 1.3 2005/03/06 23:05:56 yamt Exp $");
#include "opt_inet.h" #include "opt_inet.h"
#include "opt_ipsec.h" #include "opt_ipsec.h"
@ -253,8 +253,10 @@ tcp_sack_option(struct tcpcb *tp, struct tcphdr *th, u_char *cp, int optlen)
num_sack_blks = optlen / 8; num_sack_blks = optlen / 8;
acked = (SEQ_GT(th->th_ack, tp->snd_una)) ? th->th_ack : tp->snd_una; acked = (SEQ_GT(th->th_ack, tp->snd_una)) ? th->th_ack : tp->snd_una;
for (i = 0; i < num_sack_blks; i++, lp += 2) { for (i = 0; i < num_sack_blks; i++, lp += 2) {
left = ntohl(*lp); memcpy(&left, lp, sizeof(*lp));
right = ntohl(*(lp + 1)); memcpy(&right, lp + 1, sizeof(*lp));
left = ntohl(left);
right = ntohl(right);
if ((SEQ_LEQ(right, acked)) || if ((SEQ_LEQ(right, acked)) ||
SEQ_GEQ(left, tp->snd_max) || SEQ_GEQ(left, tp->snd_max) ||