aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipcomp.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-02-28 11:23:17 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-28 11:23:17 -0800
commit21e43188f272c7fd9efc84b8244c0b1dfccaa105 (patch)
treead0313f88c3abe948e5a5ec61fd404a5cbfd2972 /net/ipv4/ipcomp.c
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff)
downloadlinux-dev-21e43188f272c7fd9efc84b8244c0b1dfccaa105.tar.xz
linux-dev-21e43188f272c7fd9efc84b8244c0b1dfccaa105.zip
[IPCOMP]: Disable BH on output when using shared tfm
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 <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--net/ipv4/ipcomp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
index ae1f45fc23b9..58b60b2fb011 100644
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@@ -108,8 +108,11 @@ static int ipcomp_compress(struct xfrm_state *x, struct sk_buff *skb)
const int cpu = get_cpu();
u8 *scratch = *per_cpu_ptr(ipcomp_scratches, cpu);
struct crypto_comp *tfm = *per_cpu_ptr(ipcd->tfms, cpu);
- int err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
+ int err;
+ local_bh_disable();
+ err = crypto_comp_compress(tfm, start, plen, scratch, &dlen);
+ local_bh_enable();
if (err)
goto out;