|
@@ -1649,7 +1649,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name,
|
|
BUG_ON(!mutex_is_locked(&key_tfm_list_mutex));
|
|
BUG_ON(!mutex_is_locked(&key_tfm_list_mutex));
|
|
|
|
|
|
tmp_tfm = kmem_cache_alloc(ecryptfs_key_tfm_cache, GFP_KERNEL);
|
|
tmp_tfm = kmem_cache_alloc(ecryptfs_key_tfm_cache, GFP_KERNEL);
|
|
- if (key_tfm != NULL)
|
|
|
|
|
|
+ if (key_tfm)
|
|
(*key_tfm) = tmp_tfm;
|
|
(*key_tfm) = tmp_tfm;
|
|
if (!tmp_tfm) {
|
|
if (!tmp_tfm) {
|
|
rc = -ENOMEM;
|
|
rc = -ENOMEM;
|
|
@@ -1668,7 +1668,7 @@ ecryptfs_add_new_key_tfm(struct ecryptfs_key_tfm **key_tfm, char *cipher_name,
|
|
"cipher with name = [%s]; rc = [%d]\n",
|
|
"cipher with name = [%s]; rc = [%d]\n",
|
|
tmp_tfm->cipher_name, rc);
|
|
tmp_tfm->cipher_name, rc);
|
|
kmem_cache_free(ecryptfs_key_tfm_cache, tmp_tfm);
|
|
kmem_cache_free(ecryptfs_key_tfm_cache, tmp_tfm);
|
|
- if (key_tfm != NULL)
|
|
|
|
|
|
+ if (key_tfm)
|
|
(*key_tfm) = NULL;
|
|
(*key_tfm) = NULL;
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
@@ -1859,7 +1859,7 @@ ecryptfs_decode_from_filename(unsigned char *dst, size_t *dst_size,
|
|
size_t src_byte_offset = 0;
|
|
size_t src_byte_offset = 0;
|
|
size_t dst_byte_offset = 0;
|
|
size_t dst_byte_offset = 0;
|
|
|
|
|
|
- if (dst == NULL) {
|
|
|
|
|
|
+ if (!dst) {
|
|
(*dst_size) = ecryptfs_max_decoded_size(src_size);
|
|
(*dst_size) = ecryptfs_max_decoded_size(src_size);
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|