From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751115AbeAVKCb (ORCPT ); Mon, 22 Jan 2018 05:02:31 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:37573 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbeAVKCa (ORCPT ); Mon, 22 Jan 2018 05:02:30 -0500 X-Google-Smtp-Source: AH8x225tnr+N84zBBZXUla4QnrjOFnDBp7pJb1+GaXny1QIa9jttlLXCxo8z7CXtB5bUfBdMnv9Qbg== Date: Mon, 22 Jan 2018 13:02:39 +0300 From: Serge Semin To: Colin King Cc: Jon Mason , Dave Jiang , Allen Hubbe , linux-ntb@googlegroups.com, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][next] NTB: ntb_tool: fix memory leak on 'buf' on error exit path Message-ID: <20180122100239.GA32024@mobilestation> References: <20180122093857.2174-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180122093857.2174-1-colin.king@canonical.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 22, 2018 at 09:38:57AM +0000, Colin King wrote: > From: Colin Ian King > > Currently there is a memory leak on buf when the call to ntb_mw_get_align > fails. Add an exit err label and jump to this so that kfree on buf frees > the memory. > > Detected by CoverityScan, CID#1464286 ("Resource leak") > > Fixes: d637628ce00c ("NTB: ntb_tool: Add full multi-port NTB API support") > Signed-off-by: Colin Ian King Good catch, thanks! Acked-by: Serge Semin > --- > drivers/ntb/test/ntb_tool.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c > index 920fc9b161b0..d592c0ffbd19 100644 > --- a/drivers/ntb/test/ntb_tool.c > +++ b/drivers/ntb/test/ntb_tool.c > @@ -659,7 +659,7 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf, > ret = ntb_mw_get_align(inmw->tc->ntb, inmw->pidx, inmw->widx, > &addr_align, &size_align, &size_max); > if (ret) > - return ret; > + goto err; > > off += scnprintf(buf + off, buf_size - off, > "Inbound MW \t%d\n", > @@ -694,6 +694,8 @@ static ssize_t tool_mw_trans_read(struct file *filep, char __user *ubuf, > &size_max); > > ret = simple_read_from_buffer(ubuf, size, offp, buf, off); > + > +err: > kfree(buf); > > return ret; > -- > 2.15.1 >