diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-11 14:26:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-11 14:26:58 -0400 |
| commit | 3c709f8fb43e07a0403bba4a8ca7ba00ab874994 (patch) | |
| tree | 9efc1e2bf6930851f0224f525b6cde0f5297fa61 /net/xfrm/xfrm_replay.c | |
| parent | 0074820978004cc484b132d7a9ce0df414660d9d (diff) | |
| parent | 9bbc052d5e63512b0ce4e201ea97e12fba9fda82 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6
Conflicts:
drivers/net/benet/be_main.c
Diffstat (limited to 'net/xfrm/xfrm_replay.c')
| -rw-r--r-- | net/xfrm/xfrm_replay.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_replay.c b/net/xfrm/xfrm_replay.c index e8a781422fe..47f1b8638df 100644 --- a/net/xfrm/xfrm_replay.c +++ b/net/xfrm/xfrm_replay.c @@ -535,6 +535,9 @@ int xfrm_init_replay(struct xfrm_state *x) replay_esn->bmp_len * sizeof(__u32) * 8) return -EINVAL; + if ((x->props.flags & XFRM_STATE_ESN) && replay_esn->replay_window == 0) + return -EINVAL; + if ((x->props.flags & XFRM_STATE_ESN) && x->replay_esn) x->repl = &xfrm_replay_esn; else |