[PATCH 1/1] fs/ecryptfs/messaging.c: remove null test before kfree

[PATCH 1/1] fs/ecryptfs/messaging.c: remove null test before kfree

[Fabian Frederick]

Fix checkpatch warning:
WARNING: kfree(NULL) is safe this check is probably not required

Cc: Tyler Hicks <tyhicks@canonical.com>
Cc: ecryptfs@vger.kernel.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 fs/ecryptfs/messaging.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
index e57380e..286f10b 100644
--- a/fs/ecryptfs/messaging.c
+++ b/fs/ecryptfs/messaging.c
@@ -434,8 +434,7 @@ void ecryptfs_release_messaging(void)
 		mutex_lock(&ecryptfs_msg_ctx_lists_mux);
 		for (i = 0; i < ecryptfs_message_buf_len; i++) {
 			mutex_lock(&ecryptfs_msg_ctx_arr[i].mux);
-			if (ecryptfs_msg_ctx_arr[i].msg)
-				kfree(ecryptfs_msg_ctx_arr[i].msg);
+			kfree(ecryptfs_msg_ctx_arr[i].msg);
 			mutex_unlock(&ecryptfs_msg_ctx_arr[i].mux);
 		}
 		kfree(ecryptfs_msg_ctx_arr);
-- 
1.8.4.5

Re: [PATCH 1/1] fs/ecryptfs/messaging.c: remove null test before kfree

[Tyler Hicks]

[-- Attachment #1: Type: text/plain, Size: 1312 bytes --]

On 2014-06-16 20:06:12, Fabian Frederick wrote:
> Fix checkpatch warning:
> WARNING: kfree(NULL) is safe this check is probably not required
> 
> Cc: Tyler Hicks <tyhicks@canonical.com>
> Cc: ecryptfs@vger.kernel.org
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---

Hi Fabian - Sorry for being slow to respond. This patch looks good. I'll
push it to my next branch.

Tyler

>  fs/ecryptfs/messaging.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/fs/ecryptfs/messaging.c b/fs/ecryptfs/messaging.c
> index e57380e..286f10b 100644
> --- a/fs/ecryptfs/messaging.c
> +++ b/fs/ecryptfs/messaging.c
> @@ -434,8 +434,7 @@ void ecryptfs_release_messaging(void)
>  		mutex_lock(&ecryptfs_msg_ctx_lists_mux);
>  		for (i = 0; i < ecryptfs_message_buf_len; i++) {
>  			mutex_lock(&ecryptfs_msg_ctx_arr[i].mux);
> -			if (ecryptfs_msg_ctx_arr[i].msg)
> -				kfree(ecryptfs_msg_ctx_arr[i].msg);
> +			kfree(ecryptfs_msg_ctx_arr[i].msg);
>  			mutex_unlock(&ecryptfs_msg_ctx_arr[i].mux);
>  		}
>  		kfree(ecryptfs_msg_ctx_arr);
> -- 
> 1.8.4.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ecryptfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]