linux-stable.git/net/ipv4/ipcomp.c, branch linux-2.6.24.y

IPCOMP: Disable BH on output when using shared tfm

2008-03-24T18:47:08+00:00

Upstream commit: 21e43188f272c7fd9efc84b8244c0b1dfccaa105

Because we use shared tfm objects in order to conserve memory,
(each tfm requires 128K of vmalloc memory), BH needs to be turned
off on output as that can occur in process context.

Previously this was done implicitly by the xfrm output code.
That was lost when it became lockless.  So we need to add the
BH disabling to IPComp directly.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Chris Wright

IPCOMP: Fetch nexthdr before ipch is destroyed

2008-02-26T00:18:37+00:00

Upstream commit: 2614fa59fa805cd488083c5602eb48533cdbc018

When I moved the nexthdr setting out of IPComp I accidently moved
the reading of ipch->nexthdr after the decompression.  Unfortunately
this means that we'd be reading from a stale ipch pointer which
doesn't work very well.

This patch moves the reading up so that we get the correct nexthdr
value.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

[IPSEC]: Fix crypto_alloc_comp error checking

2007-11-07T12:15:03+00:00

The function crypto_alloc_comp returns an errno instead of NULL
to indicate error.  So it needs to be tested with IS_ERR.

This is based on a patch by Vicen� Beltran Querol.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

cleanup asm/scatterlist.h includes

2007-11-02T07:47:06+00:00

Not architecture specific code should not #include .

This patch therefore either replaces them with
#include  or simply removes them if they were
unused.

Signed-off-by: Adrian Bunk 
Signed-off-by: Jens Axboe

[IPSEC]: Move IP protocol setting from transforms into xfrm4_input.c

2007-10-10T23:55:56+00:00

This patch makes the IPv4 x->type->input functions return the next protocol
instead of setting it directly.  This is identical to how we do things in
IPv6 and will help us merge common code on the input path.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

[IPSEC]: Move IP length/checksum setting out of transforms

2007-10-10T23:55:56+00:00

This patch moves the setting of the IP length and checksum fields out of
the transforms and into the xfrmX_output functions.  This would help future
efforts in merging the transforms themselves.

It also adds an optimisation to ipcomp due to the fact that the transport
offset is guaranteed to be zero.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

[IPSEC]: Get rid of ipv6_{auth,esp,comp}_hdr

2007-10-10T23:55:55+00:00

This patch removes the duplicate ipv6_{auth,esp,comp}_hdr structures since
they're identical to the IPv4 versions.  Duplicating them would only create
problems for ourselves later when we need to add things like extended
sequence numbers.

I've also added transport header type conversion headers for these types
which are now used by the transforms.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10T23:55:54+00:00

The IPv6 calling convention for x->mode->output is more general and could
help an eventual protocol-generic x->type->output implementation.  This
patch adopts it for IPv4 as well and modifies the IPv4 type output functions
accordingly.

It also rewrites the IPv6 mac/transport header calculation to be based off
the network header where practical.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

[IPSEC]: Set skb->data to payload in x->mode->output

2007-10-10T23:55:54+00:00

This patch changes the calling convention so that on entry from
x->mode->output and before entry into x->type->output skb->data
will point to the payload instead of the IP header.

This is essentially a redistribution of skb_push/skb_pull calls
with the aim of minimising them on the common path of tunnel +
ESP.

It'll also let us use the same calling convention between IPv4
and IPv6 with the next patch.

Signed-off-by: Herbert Xu 
Signed-off-by: David S. Miller

[XFRM]: Add module alias for transformation type.

2007-07-11T05:15:43+00:00

It is clean-up for XFRM type modules and adds aliases with its
protocol:
 ESP, AH, IPCOMP, IPIP and IPv6 for IPsec
 ROUTING and DSTOPTS for MIPv6

It is almost the same thing as XFRM mode alias, but it is added
new defines XFRM_PROTO_XXX for preprocessing since some protocols
are defined as enum.

Signed-off-by: Masahide NAKAMURA 
Acked-by: Ingo Oeser 
Signed-off-by: David S. Miller