From 35121e5ab50e4b72b98e8193e0d2ab50cea522ea Mon Sep 17 00:00:00 2001
From: Jesper Juhl <juhl-lkml@dif.dk>
Date: Wed, 6 Jul 2005 13:54:31 -0700
Subject: [PATCH] --- yaml --- r: 4180 b: refs/heads/master c:
 a61cc44812ff94793987bf43b70a3d9bc64a6820 h: refs/heads/master v: v3

---
 [refs]             |  2 +-
 trunk/crypto/api.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8c4ef9832235..fd73cdd240d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 476df259cd577e20379b02a7f7ffd086ea925a83
+refs/heads/master: a61cc44812ff94793987bf43b70a3d9bc64a6820
diff --git a/trunk/crypto/api.c b/trunk/crypto/api.c
index 2d8d828c0ca2..b4728811ce3b 100644
--- a/trunk/crypto/api.c
+++ b/trunk/crypto/api.c
@@ -13,6 +13,8 @@
  * any later version.
  *
  */
+
+#include <linux/compiler.h>
 #include <linux/init.h>
 #include <linux/crypto.h>
 #include <linux/errno.h>
@@ -189,8 +191,14 @@ struct crypto_tfm *crypto_alloc_tfm(const char *name, u32 flags)
 
 void crypto_free_tfm(struct crypto_tfm *tfm)
 {
-	struct crypto_alg *alg = tfm->__crt_alg;
-	int size = sizeof(*tfm) + alg->cra_ctxsize;
+	struct crypto_alg *alg;
+	int size;
+
+	if (unlikely(!tfm))
+		return;
+
+	alg = tfm->__crt_alg;
+	size = sizeof(*tfm) + alg->cra_ctxsize;
 
 	crypto_exit_ops(tfm);
 	crypto_alg_put(alg);