diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-18 04:35:15 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-18 04:35:15 (GMT) |
| commit | ca68145f16359f71cd62b2671aa3e8c58f45ef19 (patch) | |
| tree | dcd8806792a443cddc1c25f015d136a179c6882b /net/ipv6/esp6.c | |
| parent | ed3e37ddb0b422120d3d2d5da718c44c40af30ba (diff) | |
| download | linux-ca68145f16359f71cd62b2671aa3e8c58f45ef19.tar.xz | |
[IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP
Combining RO and AH/ESP/IPCOMP does not make sense. So this patch adds a
check in the state initialisation function to prevent this.
This allows us to safely remove the mode input function of RO since it
can never be called anymore. Indeed, if somehow it does get called we'll
know about it through an OOPS instead of it slipping past silently.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/esp6.c')
| -rw-r--r-- | net/ipv6/esp6.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 9eb9285..b071543 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -354,8 +354,15 @@ static int esp6_init_state(struct xfrm_state *x) (x->ealg->alg_key_len + 7) / 8)) goto error; x->props.header_len = sizeof(struct ip_esp_hdr) + esp->conf.ivlen; - if (x->props.mode == XFRM_MODE_TUNNEL) + switch (x->props.mode) { + case XFRM_MODE_BEET: + case XFRM_MODE_TRANSPORT: + break; + case XFRM_MODE_TUNNEL: x->props.header_len += sizeof(struct ipv6hdr); + default: + goto error; + } x->data = esp; return 0; |