Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH v2] consolemap: Fix a memory leaking bug in
 drivers/tty/vt/consolemap.c
To:     Kees Cook <keescook@chromium.org>,
        Gen Zhang <blackgod016574@gmail.com>,
        Greg KH <gregkh@linuxfoundation.org>
CC:     <jslaby@suse.com>, <linux-kernel@vger.kernel.org>
References: <20190521092935.GA2297@zhanggen-UX430UQ>
 <201905211342.DE554F0D@keescook> <20190522015055.GC4093@zhanggen-UX430UQ>
 <201905221353.AD8E585E6D@keescook> <20190523003452.GB14060@zhanggen-UX430UQ>
 <201905230952.B47ADA17A@keescook>
From:   Jon Hunter <jonathanh@nvidia.com>
Message-ID: <b99d0da6-a1d6-1c04-66ff-b2937d21d346@nvidia.com>
Date:   Fri, 24 May 2019 10:37:59 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <201905230952.B47ADA17A@keescook>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Kees,

On 23/05/2019 17:54, Kees Cook wrote:
> On Thu, May 23, 2019 at 08:34:52AM +0800, Gen Zhang wrote:
>> In function con_insert_unipair(), when allocation for p2 and p1[n]
>> fails, ENOMEM is returned, but previously allocated p1 is not freed, 
>> remains as leaking memory. Thus we should free p1 as well when this
>> allocation fails.
>>
>> Signed-off-by: Gen Zhang <blackgod016574@gmail.com>
> 
> As far as I can see this is correct, as it's just restoring the prior
> state before the p1 allocation.

Are you sure this is correct? It looks like p1 is only allocated if
p->uni_pgdir[n = unicode >> 11] == NULL.

I only mention this because I have seen a few patches from Gen today
regarding memory leaks and devm_kzalloc() that are not correct.

> Reviewed-by: Kees Cook <keescook@chromium.org>
> 
>> ---
>> diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
>> index b28aa0d..79fcc96 100644
>> --- a/drivers/tty/vt/consolemap.c
>> +++ b/drivers/tty/vt/consolemap.c
>> @@ -489,7 +489,11 @@ con_insert_unipair(struct uni_pagedir *p, u_short unicode, u_short fontpos)
>>  	p2 = p1[n = (unicode >> 6) & 0x1f];
>>  	if (!p2) {
>>  		p2 = p1[n] = kmalloc_array(64, sizeof(u16), GFP_KERNEL);
>> -		if (!p2) return -ENOMEM;
>> +		if (!p2) {
>> +			kfree(p1);
>> +			p->uni_pgdir[n] = NULL;
>> +			return -ENOMEM;
>> +		}
>>  		memset(p2, 0xff, 64*sizeof(u16)); /* No glyphs for the characters (yet) */
>>  	}
>>  
>> ---

Cheers
Jon

-- 
nvpublic