diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-10-17 21:35:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-17 21:35:15 -0700 |
| commit | ca68145f16359f71cd62b2671aa3e8c58f45ef19 (patch) | |
| tree | dcd8806792a443cddc1c25f015d136a179c6882b /net/ipv6/xfrm6_mode_ro.c | |
| parent | ed3e37ddb0b422120d3d2d5da718c44c40af30ba (diff) | |
| download | lwn-ca68145f16359f71cd62b2671aa3e8c58f45ef19.tar.gz lwn-ca68145f16359f71cd62b2671aa3e8c58f45ef19.zip | |
[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/xfrm6_mode_ro.c')
| -rw-r--r-- | net/ipv6/xfrm6_mode_ro.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c index 957ae36b6695..a7bc8c62317a 100644 --- a/net/ipv6/xfrm6_mode_ro.c +++ b/net/ipv6/xfrm6_mode_ro.c @@ -58,16 +58,7 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb) return 0; } -/* - * Do nothing about routing optimization header unlike IPsec. - */ -static int xfrm6_ro_input(struct xfrm_state *x, struct sk_buff *skb) -{ - return 0; -} - static struct xfrm_mode xfrm6_ro_mode = { - .input = xfrm6_ro_input, .output = xfrm6_ro_output, .owner = THIS_MODULE, .encap = XFRM_MODE_ROUTEOPTIMIZATION, |