Re: [PATCH linux-next] ecryptfs: ecryptfs_msg_ctx_alloc_to_free(): remove kfree() redundant null check

[Tyler Hicks <tyhicks@canonical.com>]

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

On 2013-02-12 11:03:49, Tim Gardner wrote:
> smatch analysis:
> 
> fs/ecryptfs/messaging.c:101 ecryptfs_msg_ctx_alloc_to_free() info:
>  redundant null check on msg_ctx->msg calling kfree()
> 
> Cc: Tyler Hicks <tyhicks@canonical.com>
> Cc: Dustin Kirkland <dustin.kirkland@gazzang.com>
> Cc: ecryptfs@vger.kernel.org
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

Thanks, Tim. Pushed to the next branch at
git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git

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 8d7a577..308fdf2 100644
> --- a/fs/ecryptfs/messaging.c
> +++ b/fs/ecryptfs/messaging.c
> @@ -97,8 +97,7 @@ static void ecryptfs_msg_ctx_free_to_alloc(struct ecryptfs_msg_ctx *msg_ctx)
>  void ecryptfs_msg_ctx_alloc_to_free(struct ecryptfs_msg_ctx *msg_ctx)
>  {
>  	list_move(&(msg_ctx->node), &ecryptfs_msg_ctx_free_list);
> -	if (msg_ctx->msg)
> -		kfree(msg_ctx->msg);
> +	kfree(msg_ctx->msg);
>  	msg_ctx->msg = NULL;
>  	msg_ctx->state = ECRYPTFS_MSG_CTX_STATE_FREE;
>  }
> -- 
> 1.7.9.5
> 

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