From 8e01b9514a90d4df4404d761b84d86c37aca5e51 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sat, 26 Jul 2008 11:59:10 +0100 Subject: [PATCH] --- yaml --- r: 106667 b: refs/heads/master c: e0bcfb0c6a6ed9ebd68746b306298dc5797fd426 h: refs/heads/master i: 106665: ef0baa974d89a47308af42a9711fc3b0a5cf00c9 106663: 576a76ee3213233168c5e46b7485b0fae60610de v: v3 --- [refs] | 2 +- trunk/net/dccp/ipv6.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8ec40dbac6c3..7785cfeb8666 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d68f0866f76e2bc4ddc07e88e2cb1bc8959a6d7e +refs/heads/master: e0bcfb0c6a6ed9ebd68746b306298dc5797fd426 diff --git a/trunk/net/dccp/ipv6.c b/trunk/net/dccp/ipv6.c index da509127e00c..25826b1bf685 100644 --- a/trunk/net/dccp/ipv6.c +++ b/trunk/net/dccp/ipv6.c @@ -89,6 +89,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, { struct ipv6hdr *hdr = (struct ipv6hdr *)skb->data; const struct dccp_hdr *dh = (struct dccp_hdr *)(skb->data + offset); + struct dccp_sock *dp; struct ipv6_pinfo *np; struct sock *sk; int err; @@ -116,6 +117,14 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, if (sk->sk_state == DCCP_CLOSED) goto out; + dp = dccp_sk(sk); + seq = dccp_hdr_seq(dh); + if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_LISTEN) && + !between48(seq, dp->dccps_awl, dp->dccps_awh)) { + NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS); + goto out; + } + np = inet6_sk(sk); if (type == ICMPV6_PKT_TOOBIG) { @@ -168,7 +177,6 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, icmpv6_err_convert(type, code, &err); - seq = dccp_hdr_seq(dh); /* Might be for an request_sock */ switch (sk->sk_state) { struct request_sock *req, **prev;