Merge git://github.com/herbertx/crypto

torvalds · torvalds · commit 42a0ddcd484d · 2011-11-11T23:40:02.000-02:00
* git://github.com/herbertx/crypto:
  crypto: algapi - Fix build problem with NET disabled
  crypto: user - Fix rwsem leak in crypto_user
diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
@@ -383,6 +383,7 @@ static int crypto_init_ablkcipher_ops(struct crypto_tfm *tfm, u32 type,
 	return 0;
 }
 
+#ifdef CONFIG_NET
 static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_blkcipher rblkcipher;
@@ -404,6 +405,12 @@ static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_ablkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
@@ -457,6 +464,7 @@ static int crypto_init_givcipher_ops(struct crypto_tfm *tfm, u32 type,
 	return 0;
 }
 
+#ifdef CONFIG_NET
 static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_blkcipher rblkcipher;
@@ -478,6 +486,12 @@ static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_givcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_givcipher_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
diff --git a/crypto/aead.c b/crypto/aead.c
@@ -111,6 +111,7 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
 	return 0;
 }
 
+#ifdef CONFIG_NET
 static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_aead raead;
@@ -132,6 +133,12 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
@@ -190,6 +197,7 @@ static int crypto_init_nivaead_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
 	return 0;
 }
 
+#ifdef CONFIG_NET
 static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_aead raead;
@@ -210,6 +218,12 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 
 static void crypto_nivaead_show(struct seq_file *m, struct crypto_alg *alg)
diff --git a/crypto/ahash.c b/crypto/ahash.c
@@ -399,6 +399,7 @@ static unsigned int crypto_ahash_extsize(struct crypto_alg *alg)
 	return sizeof(struct crypto_shash *);
 }
 
+#ifdef CONFIG_NET
 static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_hash rhash;
@@ -416,6 +417,12 @@ static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_ahash_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_ahash_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
@@ -494,6 +494,7 @@ static int crypto_init_blkcipher_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
 		return crypto_init_blkcipher_ops_async(tfm);
 }
 
+#ifdef CONFIG_NET
 static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_blkcipher rblkcipher;
@@ -515,6 +516,12 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
@@ -44,9 +44,6 @@ static struct crypto_alg *crypto_alg_match(struct crypto_user_alg *p, int exact)
 
 	down_read(&crypto_alg_sem);
 
-	if (list_empty(&crypto_alg_list))
-		return NULL;
-
 	list_for_each_entry(q, &crypto_alg_list, cra_list) {
 		int match = 0;
 
diff --git a/crypto/pcompress.c b/crypto/pcompress.c
@@ -48,6 +48,7 @@ static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm)
 	return 0;
 }
 
+#ifdef CONFIG_NET
 static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_comp rpcomp;
@@ -62,6 +63,12 @@ static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_pcomp_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_pcomp_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
diff --git a/crypto/rng.c b/crypto/rng.c
@@ -60,6 +60,7 @@ static int crypto_init_rng_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
 	return 0;
 }
 
+#ifdef CONFIG_NET
 static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_rng rrng;
@@ -76,6 +77,12 @@ static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_rng_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_rng_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));
diff --git a/crypto/shash.c b/crypto/shash.c
@@ -524,6 +524,7 @@ static unsigned int crypto_shash_extsize(struct crypto_alg *alg)
 	return alg->cra_ctxsize;
 }
 
+#ifdef CONFIG_NET
 static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
 {
 	struct crypto_report_hash rhash;
@@ -541,6 +542,12 @@ static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
 nla_put_failure:
 	return -EMSGSIZE;
 }
+#else
+static int crypto_shash_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+	return -ENOSYS;
+}
+#endif
 
 static void crypto_shash_show(struct seq_file *m, struct crypto_alg *alg)
 	__attribute__ ((unused));

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask)`
`111`	`111`	`return 0;`
`112`	`112`	`}`
`113`	`113`
	`114`	`+#ifdef CONFIG_NET`
`114`	`115`	`static int crypto_aead_report(struct sk_buff skb, struct crypto_alg alg)`
`115`	`116`	`{`
`116`	`117`	`struct crypto_report_aead raead;`
`@@ -132,6 +133,12 @@ static int crypto_aead_report(struct sk_buff skb, struct crypto_alg alg)`
`132`	`133`	`nla_put_failure:`
`133`	`134`	`return -EMSGSIZE;`
`134`	`135`	`}`
	`136`	`+#else`
	`137`	`+static int crypto_aead_report(struct sk_buff skb, struct crypto_alg alg)`
	`138`	`+{`
	`139`	`+ return -ENOSYS;`
	`140`	`+}`
	`141`	`+#endif`
`135`	`142`
`136`	`143`	`static void crypto_aead_show(struct seq_file m, struct crypto_alg alg)`
`137`	`144`	`__attribute__ ((unused));`
`@@ -190,6 +197,7 @@ static int crypto_init_nivaead_ops(struct crypto_tfm *tfm, u32 type, u32 mask)`
`190`	`197`	`return 0;`
`191`	`198`	`}`
`192`	`199`
	`200`	`+#ifdef CONFIG_NET`
`193`	`201`	`static int crypto_nivaead_report(struct sk_buff skb, struct crypto_alg alg)`
`194`	`202`	`{`
`195`	`203`	`struct crypto_report_aead raead;`
`@@ -210,6 +218,12 @@ static int crypto_nivaead_report(struct sk_buff skb, struct crypto_alg alg)`
`210`	`218`	`nla_put_failure:`
`211`	`219`	`return -EMSGSIZE;`
`212`	`220`	`}`
	`221`	`+#else`
	`222`	`+static int crypto_nivaead_report(struct sk_buff skb, struct crypto_alg alg)`
	`223`	`+{`
	`224`	`+ return -ENOSYS;`
	`225`	`+}`
	`226`	`+#endif`
`213`	`227`
`214`	`228`
`215`	`229`	`static void crypto_nivaead_show(struct seq_file m, struct crypto_alg alg)`
Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ static unsigned int crypto_ahash_extsize(struct crypto_alg *alg)`
`399`	`399`	`return sizeof(struct crypto_shash *);`
`400`	`400`	`}`
`401`	`401`
	`402`	`+#ifdef CONFIG_NET`
`402`	`403`	`static int crypto_ahash_report(struct sk_buff skb, struct crypto_alg alg)`
`403`	`404`	`{`
`404`	`405`	`struct crypto_report_hash rhash;`
`@@ -416,6 +417,12 @@ static int crypto_ahash_report(struct sk_buff skb, struct crypto_alg alg)`
`416`	`417`	`nla_put_failure:`
`417`	`418`	`return -EMSGSIZE;`
`418`	`419`	`}`
	`420`	`+#else`
	`421`	`+static int crypto_ahash_report(struct sk_buff skb, struct crypto_alg alg)`
	`422`	`+{`
	`423`	`+ return -ENOSYS;`
	`424`	`+}`
	`425`	`+#endif`
`419`	`426`
`420`	`427`	`static void crypto_ahash_show(struct seq_file m, struct crypto_alg alg)`
`421`	`428`	`__attribute__ ((unused));`
Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ static int crypto_init_blkcipher_ops(struct crypto_tfm *tfm, u32 type, u32 mask)`
`494`	`494`	`return crypto_init_blkcipher_ops_async(tfm);`
`495`	`495`	`}`
`496`	`496`
	`497`	`+#ifdef CONFIG_NET`
`497`	`498`	`static int crypto_blkcipher_report(struct sk_buff skb, struct crypto_alg alg)`
`498`	`499`	`{`
`499`	`500`	`struct crypto_report_blkcipher rblkcipher;`
`@@ -515,6 +516,12 @@ static int crypto_blkcipher_report(struct sk_buff skb, struct crypto_alg alg)`
`515`	`516`	`nla_put_failure:`
`516`	`517`	`return -EMSGSIZE;`
`517`	`518`	`}`
	`519`	`+#else`
	`520`	`+static int crypto_blkcipher_report(struct sk_buff skb, struct crypto_alg alg)`
	`521`	`+{`
	`522`	`+ return -ENOSYS;`
	`523`	`+}`
	`524`	`+#endif`
`518`	`525`
`519`	`526`	`static void crypto_blkcipher_show(struct seq_file m, struct crypto_alg alg)`
`520`	`527`	`__attribute__ ((unused));`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ static int crypto_pcomp_init_tfm(struct crypto_tfm *tfm)`
`48`	`48`	`return 0;`
`49`	`49`	`}`
`50`	`50`
	`51`	`+#ifdef CONFIG_NET`
`51`	`52`	`static int crypto_pcomp_report(struct sk_buff skb, struct crypto_alg alg)`
`52`	`53`	`{`
`53`	`54`	`struct crypto_report_comp rpcomp;`
`@@ -62,6 +63,12 @@ static int crypto_pcomp_report(struct sk_buff skb, struct crypto_alg alg)`
`62`	`63`	`nla_put_failure:`
`63`	`64`	`return -EMSGSIZE;`
`64`	`65`	`}`
	`66`	`+#else`
	`67`	`+static int crypto_pcomp_report(struct sk_buff skb, struct crypto_alg alg)`
	`68`	`+{`
	`69`	`+ return -ENOSYS;`
	`70`	`+}`
	`71`	`+#endif`
`65`	`72`
`66`	`73`	`static void crypto_pcomp_show(struct seq_file m, struct crypto_alg alg)`
`67`	`74`	`__attribute__ ((unused));`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ static int crypto_init_rng_ops(struct crypto_tfm *tfm, u32 type, u32 mask)`
`60`	`60`	`return 0;`
`61`	`61`	`}`
`62`	`62`
	`63`	`+#ifdef CONFIG_NET`
`63`	`64`	`static int crypto_rng_report(struct sk_buff skb, struct crypto_alg alg)`
`64`	`65`	`{`
`65`	`66`	`struct crypto_report_rng rrng;`
`@@ -76,6 +77,12 @@ static int crypto_rng_report(struct sk_buff skb, struct crypto_alg alg)`
`76`	`77`	`nla_put_failure:`
`77`	`78`	`return -EMSGSIZE;`
`78`	`79`	`}`
	`80`	`+#else`
	`81`	`+static int crypto_rng_report(struct sk_buff skb, struct crypto_alg alg)`
	`82`	`+{`
	`83`	`+ return -ENOSYS;`
	`84`	`+}`
	`85`	`+#endif`
`79`	`86`
`80`	`87`	`static void crypto_rng_show(struct seq_file m, struct crypto_alg alg)`
`81`	`88`	`__attribute__ ((unused));`
Original file line number	Diff line number	Diff line change
`@@ -524,6 +524,7 @@ static unsigned int crypto_shash_extsize(struct crypto_alg *alg)`
`524`	`524`	`return alg->cra_ctxsize;`
`525`	`525`	`}`
`526`	`526`
	`527`	`+#ifdef CONFIG_NET`
`527`	`528`	`static int crypto_shash_report(struct sk_buff skb, struct crypto_alg alg)`
`528`	`529`	`{`
`529`	`530`	`struct crypto_report_hash rhash;`
`@@ -541,6 +542,12 @@ static int crypto_shash_report(struct sk_buff skb, struct crypto_alg alg)`
`541`	`542`	`nla_put_failure:`
`542`	`543`	`return -EMSGSIZE;`
`543`	`544`	`}`
	`545`	`+#else`
	`546`	`+static int crypto_shash_report(struct sk_buff skb, struct crypto_alg alg)`
	`547`	`+{`
	`548`	`+ return -ENOSYS;`
	`549`	`+}`
	`550`	`+#endif`
`544`	`551`
`545`	`552`	`static void crypto_shash_show(struct seq_file m, struct crypto_alg alg)`
`546`	`553`	`__attribute__ ((unused));`