diff options
author | Ondrej Kozina <okozina@redhat.com> | 2014-08-25 11:49:54 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-12-14 16:24:01 +0000 |
commit | 3308bdcc24f3591ace96289137c9411bc2181602 (patch) | |
tree | 1d57db215ce4f1a9b5616c3bfc09581ea16b9e34 /crypto | |
parent | 607d8297d5d78dc84dc8257a60f2c0a5863a07d6 (diff) | |
download | linux-stable-3308bdcc24f3591ace96289137c9411bc2181602.tar.gz linux-stable-3308bdcc24f3591ace96289137c9411bc2181602.tar.bz2 linux-stable-3308bdcc24f3591ace96289137c9411bc2181602.zip |
crypto: algif - avoid excessive use of socket buffer in skcipher
commit e2cffb5f493a8b431dc87124388ea59b79f0bccb upstream.
On archs with PAGE_SIZE >= 64 KiB the function skcipher_alloc_sgl()
fails with -ENOMEM no matter what user space actually requested.
This is caused by the fact sock_kmalloc call inside the function tried
to allocate more memory than allowed by the default kernel socket buffer
size (kernel param net.core.optmem_max).
Signed-off-by: Ondrej Kozina <okozina@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/algif_skcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index a19c027b29bd..83187f497c7c 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -49,7 +49,7 @@ struct skcipher_ctx { struct ablkcipher_request req; }; -#define MAX_SGL_ENTS ((PAGE_SIZE - sizeof(struct skcipher_sg_list)) / \ +#define MAX_SGL_ENTS ((4096 - sizeof(struct skcipher_sg_list)) / \ sizeof(struct scatterlist) - 1) static inline int skcipher_sndbuf(struct sock *sk) |