summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-07-03 15:04:57 -0700
committerChanho Park <chanho61.park@samsung.com>2014-08-08 15:20:52 +0900
commit4b3f31b470acf4ed1f069607be42f5bbb7ae4007 (patch)
treed2d960b2e0d3ad1f48fdcc4984ea354ef0210893 /crypto
parent1779fc2b2dbdf38fdfb6efd9d1ff615d175b7fa0 (diff)
downloadlinux-3.10-4b3f31b470acf4ed1f069607be42f5bbb7ae4007.tar.gz
linux-3.10-4b3f31b470acf4ed1f069607be42f5bbb7ae4007.tar.bz2
linux-3.10-4b3f31b470acf4ed1f069607be42f5bbb7ae4007.zip
upstream: drivers: avoid format strings in names passed to alloc_workqueue()
For the workqueue creation interfaces that do not expect format strings, make sure they cannot accidently be parsed that way. Additionally, clean up calls made with a single parameter that would be handled as a format string. Many callers are passing potentially dynamic string content, so use "%s" in those cases to avoid any potential accidents. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/pcrypt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index b2c99dc1c5e..f8c920cafe6 100644
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -455,8 +455,8 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
get_online_cpus();
- pcrypt->wq = alloc_workqueue(name,
- WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1);
+ pcrypt->wq = alloc_workqueue("%s", WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE,
+ 1, name);
if (!pcrypt->wq)
goto err;