diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2012-03-29 09:04:46 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-03-29 19:52:48 +0800 |
| commit | 5219a5342ab13650ae0f0c62319407268c48d0ab (patch) | |
| tree | 42f49976ca15418e512bc172e2b4b08c86b2008a | |
| parent | 1e1229940045a537c61fb69f86010a8774e576d0 (diff) | |
| download | linux-3.10-5219a5342ab13650ae0f0c62319407268c48d0ab.tar.gz linux-3.10-5219a5342ab13650ae0f0c62319407268c48d0ab.tar.bz2 linux-3.10-5219a5342ab13650ae0f0c62319407268c48d0ab.zip | |
crypto: user - Fix size of netlink dump message
The default netlink message size limit might be exceeded when dumping a
lot of algorithms to userspace. As a result, not all of the instantiated
algorithms dumped to userspace. So calculate an upper bound on the message
size and call netlink_dump_start() with that value.
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/crypto_user.c | 8 | ||||
| -rw-r--r-- | include/linux/cryptouser.h | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c index e91c16111ed..f1ea0a06413 100644 --- a/crypto/crypto_user.c +++ b/crypto/crypto_user.c @@ -457,12 +457,20 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) && (nlh->nlmsg_flags & NLM_F_DUMP))) { + struct crypto_alg *alg; + u16 dump_alloc = 0; + if (link->dump == NULL) return -EINVAL; + + list_for_each_entry(alg, &crypto_alg_list, cra_list) + dump_alloc += CRYPTO_REPORT_MAXSIZE; + { struct netlink_dump_control c = { .dump = link->dump, .done = link->done, + .min_dump_alloc = dump_alloc, }; return netlink_dump_start(crypto_nlsk, skb, nlh, &c); } diff --git a/include/linux/cryptouser.h b/include/linux/cryptouser.h index 532fb58f16b..4abf2ea6a88 100644 --- a/include/linux/cryptouser.h +++ b/include/linux/cryptouser.h @@ -100,3 +100,6 @@ struct crypto_report_rng { char type[CRYPTO_MAX_NAME]; unsigned int seedsize; }; + +#define CRYPTO_REPORT_MAXSIZE (sizeof(struct crypto_user_alg) + \ + sizeof(struct crypto_report_blkcipher)) |