Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106667
b: refs/heads/master
c: e0bcfb0
h: refs/heads/master
i:
  106665: ef0baa9
  106663: 576a76e
v: v3
  • Loading branch information
Wei Yongjun authored and Gerrit Renker committed Jul 26, 2008
1 parent 6bf86fb commit 8e01b95
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d68f0866f76e2bc4ddc07e88e2cb1bc8959a6d7e
refs/heads/master: e0bcfb0c6a6ed9ebd68746b306298dc5797fd426
10 changes: 9 additions & 1 deletion trunk/net/dccp/ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 8e01b95

Please sign in to comment.