diff options
| author | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> | 2010-08-04 11:39:52 -0700 |
|---|---|---|
| committer | Misaki Miyashita <Misaki.Miyashita@Oracle.COM> | 2010-08-04 11:39:52 -0700 |
| commit | 9a986656ba247e9b452282c937b4f954fc6460c3 (patch) | |
| tree | 565d91d9eee2434a8c58dbd8d3a1da5ba7c66c48 /usr/src/uts/common/crypto | |
| parent | a01be845e9dee367d46c5b5e02e8f1e9d7c98be3 (diff) | |
| download | illumos-joyent-9a986656ba247e9b452282c937b4f954fc6460c3.tar.gz | |
6972233 Panic is seen when fips-140 mode is enabled and rebooted
Diffstat (limited to 'usr/src/uts/common/crypto')
| -rw-r--r-- | usr/src/uts/common/crypto/core/kcf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/crypto/core/kcf.c b/usr/src/uts/common/crypto/core/kcf.c index e170b77977..3ffaac033d 100644 --- a/usr/src/uts/common/crypto/core/kcf.c +++ b/usr/src/uts/common/crypto/core/kcf.c @@ -247,7 +247,7 @@ kcf_fips140_integrity_check() { door_arg_t darg; door_handle_t ldh; - kcf_door_arg_t *kda = { 0 }, *rkda; + kcf_door_arg_t *kda = { 0 }, *rkda = NULL; int ret = 0; KCF_FRMWRK_DEBUG(1, ("Starting IC check")); @@ -294,7 +294,7 @@ kcf_fips140_integrity_check() KCF_FRMWRK_DEBUG(1, ("Integrity Check succeeds.\n")); exit: - if (rkda != kda) + if ((rkda != NULL) && (rkda != kda)) kmem_free(rkda, darg.rsize); kmem_free(kda, sizeof (kcf_door_arg_t)); |