ecryptfs: Adjust four checks for null pointers
The script “checkpatch.pl” pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Родитель
a463ce5bbd
Коммит
5032f360dd
|
@ -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));
|
||||
|
||||
tmp_tfm = kmem_cache_alloc(ecryptfs_key_tfm_cache, GFP_KERNEL);
|
||||
if (key_tfm != NULL)
|
||||
if (key_tfm)
|
||||
(*key_tfm) = tmp_tfm;
|
||||
if (!tmp_tfm) {
|
||||
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",
|
||||
tmp_tfm->cipher_name, rc);
|
||||
kmem_cache_free(ecryptfs_key_tfm_cache, tmp_tfm);
|
||||
if (key_tfm != NULL)
|
||||
if (key_tfm)
|
||||
(*key_tfm) = NULL;
|
||||
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 dst_byte_offset = 0;
|
||||
|
||||
if (dst == NULL) {
|
||||
if (!dst) {
|
||||
(*dst_size) = ecryptfs_max_decoded_size(src_size);
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -685,7 +685,7 @@ ecryptfs_write_tag_70_packet(char *dest, size_t *remaining_bytes,
|
|||
* separator, and then the filename */
|
||||
s->max_packet_size = (ECRYPTFS_TAG_70_MAX_METADATA_SIZE
|
||||
+ s->block_aligned_filename_size);
|
||||
if (dest == NULL) {
|
||||
if (!dest) {
|
||||
(*packet_size) = s->max_packet_size;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче