Re: [PATCH] xfs_io: fix memory leak in add_enckey

[Eric Sandeen <sandeen@sandeen.net>]

On 11/7/19 3:58 PM, Eric Sandeen wrote:
> On 11/7/19 3:46 PM, Eric Biggers wrote:
>> On Thu, Nov 07, 2019 at 10:50:59AM -0600, Eric Sandeen wrote:
>>> Invalid arguments to add_enckey will leak the "arg" allocation,
>>> so fix that.
>>>
>>> Fixes: ba71de04 ("xfs_io/encrypt: add 'add_enckey' command")
>>> Fixes-coverity-id: 1454644
>>> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
>>> ---
>>>
>>> diff --git a/io/encrypt.c b/io/encrypt.c
>>> index 17d61cfb..c6a4e190 100644
>>> --- a/io/encrypt.c
>>> +++ b/io/encrypt.c
>>> @@ -696,6 +696,7 @@ add_enckey_f(int argc, char **argv)
>>>  				goto out;
>>>  			break;
>>>  		default:
>>> +			free(arg);
>>>  			return command_usage(&add_enckey_cmd);
>>>  		}
>>>  	}
>>>
>>
>> The same leak happens later in the function too.  How about this instead:
> 
> whoops yes it does.  I kind of hate "retval = command_usage" but seeing the
> memset of the key on the way out it's probably prudent to have one common
> exit point after the function gets started.
> 
> Care to send this as a formal patch?

<interprets silence as a "no"> ;)

I'll just incorporate your fixes as an addendum to my patch, then.

-Eric