summaryrefslogtreecommitdiff
path: root/crypto/crypto_user.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-01-12 10:51:13 +0100
committerThomas Gleixner <tglx@linutronix.de>2015-01-12 10:51:13 +0100
commit3572bfff3a58b312276b882c15b9f517a0c3c4ac (patch)
tree95df302ae8134263edc38067b03617fa19fb5635 /crypto/crypto_user.c
parentdb85fba98caa6ea9e54e93b33df8fdbadf6d20df (diff)
parentad8b05dfadb938841880a3c05fd76e51af30b1f1 (diff)
downloadlinux-crypto-3572bfff3a58b312276b882c15b9f517a0c3c4ac.tar.gz
linux-crypto-3572bfff3a58b312276b882c15b9f517a0c3c4ac.zip
Merge tag 'irqchip-urgent-3.19' of git://git.infradead.org/users/jcooper/linux into irq/urgent
irqchip urgent fixes for v3.19 from Jason Cooper - mtk-sysirq: Fix error handling - hip04: Fix cpu map for 16bit value - gic-v3-its: Clear a warning regarding decimal constants - omap-intc: Fix legacy DMA regression - atmel-aic-common: Retain priority when changing type
Diffstat (limited to '')
-rw-r--r--crypto/crypto_user.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index e2a34fee..c5148a35 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -201,10 +201,7 @@ static int crypto_report(struct sk_buff *in_skb, struct nlmsghdr *in_nlh,
if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
return -EINVAL;
- if (!p->cru_driver_name[0])
- return -EINVAL;
-
- alg = crypto_alg_match(p, 1);
+ alg = crypto_alg_match(p, 0);
if (!alg)
return -ENOENT;
@@ -537,3 +534,4 @@ module_exit(crypto_user_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Steffen Klassert <steffen.klassert@secunet.com>");
MODULE_DESCRIPTION("Crypto userspace configuration API");
+MODULE_ALIAS("net-pf-16-proto-21");