Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp4505446ybc; Tue, 26 Nov 2019 09:58:16 -0800 (PST) X-Google-Smtp-Source: APXvYqzLBlN1giuKSBi2T5ok4oP2a8hQIoz5cHMezyyaEm35djKnncI9J349ih4TnR7WF20wIC/H X-Received: by 2002:a17:906:80ce:: with SMTP id a14mr19407113ejx.118.1574791096676; Tue, 26 Nov 2019 09:58:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574791096; cv=none; d=google.com; s=arc-20160816; b=Ury7usPhBmxrTAs3lKCL1KrspDN5KyzmDvOmEiH7ccLoaJMAgemo3w+w6GOCqeKtPc aSk1h1FIpGNSJN4A/EK8BrkrkA7v4hRcPif8C8vKHtZ63MKjv9kWZnWpjXhZlWC1M+/w fyIlzUtJSCusTUgYC78/0JCb6bE5OzvP0aQjL2oxJ3WilhxFJNiWze8CMZqjuEdfBV62 SxBGAiyjDYC1Pesxz6Jmv4CDaj2trZPz9o9qFRf/ZvJuW7o7TW1pbk54IrpbS0QRX823 A0IM2OerLT8Iwg9fC9OBDXt3vSaMmUQlyzoElsHhx4tDNEggvyISNm8xhB01ItjmhhIv x8qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=t54fAVQIi9k5/AbZql5pbL2ivaJ6crm1GO25m9MjvJc=; b=p/+ll2Xh7M0qPK8fbrkcKm4sG8Vs/E7gMyydrDBosWTU8T9sR3OzfYAzHYC5mBr68k 4+r1kEEO5kwPYyQnhcXdcBHhLBaDBKYiTA90dyQQ3yzPdrEnxH/+jDwB3W13aMZafc9u mmgEZmJMGFTrBUxzCqqbziCtHL/mJU2QawzsOCx+QStPNjIBA3wEXrxDGGYQIt9evR1X pxCdVXWkrmq2OAaFrS0dWvdfzKpUs8MnoecvpiAKuSleaw2U5VPma/O3tyzDBsJ4FhGd uuk479MkXaz7c3/o9zD/8oBXBDHCsfM0YTI8epyW4caDXMX6MEMNl7vlTlioWUEx5UcE LIvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ATWoCaDT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 39si8039804edz.341.2019.11.26.09.57.52; Tue, 26 Nov 2019 09:58:16 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=ATWoCaDT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726636AbfKZRu5 (ORCPT + 99 others); Tue, 26 Nov 2019 12:50:57 -0500 Received: from mail-il1-f194.google.com ([209.85.166.194]:40327 "EHLO mail-il1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726005AbfKZRu5 (ORCPT ); Tue, 26 Nov 2019 12:50:57 -0500 Received: by mail-il1-f194.google.com with SMTP id v17so14560248ilg.7 for ; Tue, 26 Nov 2019 09:50:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=t54fAVQIi9k5/AbZql5pbL2ivaJ6crm1GO25m9MjvJc=; b=ATWoCaDTK3L62Ae6m3HNV6BKsPyvxBQuhyHHaO3QgvSSWyqbykVd4bX5NAIBjRvMio kLER7x38kNXm/78aAQD5HSJb0mAsWFcSkOF6txn5eWOPWmNF6bEpn1Y+ijU2c0ixBD2d zXol2/FurfuSesv7zr5bTxT+Z+bf0idq3SSf1/ekhPTSqbd11/HiKSUgGHn550ywg3IP SVdneLDrtS97GYycmry5pvAFNM0NQqSzN3GnJ94X3zA/7tnmLffKOKe+zLFLzLIoo4+B muMPEUw4KrHEh20uX9lRjQTtLEU9oGaCdZWkcxvYbZqKYd08cMN4Ol8cd8+MSJWH8lEU Fp2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=t54fAVQIi9k5/AbZql5pbL2ivaJ6crm1GO25m9MjvJc=; b=apxpRyUBKyqtg36Uu42fuNVSxZpaYOQ+CPC6qPf47VR4OSsl50sjnyoX/x9NPGFYPQ 4cuvoxOisrMDlj/qPMGWZub4lI9Lc3YRfoGlYRCk5RLZe1xjEReUOD4L90y4wruFhfDj +ppZ39NbaSxbfxS5OIH6oWM8TXD0n1nh/48t0meCIRmv5BfIalnchXcoddt6WWD6ZUIm uqxsccKUe4xzqRdG1W29o4bNWrh9BNQoDGtJc0GAzV9/MjEt09krRp7oXwn6mONEKSVF hX4Uh7XGodPfWhV9y63RMMCz0sFPJeDV8je0IBAKnS6Ot9N6aSbfNbiqNtQ5qjwfmcaf JDWw== X-Gm-Message-State: APjAAAV86ehFR7/UZZxjIpyNjKOZbqTdHRsU1BFRrFFd4ATWDEfvMHcl 9ab0/w3R8noSmxKe2QCLaCKtX/ZhZh1Nax0kJJI= X-Received: by 2002:a92:ca8b:: with SMTP id t11mr26640081ilo.227.1574790656094; Tue, 26 Nov 2019 09:50:56 -0800 (PST) MIME-Version: 1.0 References: <20191021211449.9104-1-navid.emamdoost@gmail.com> In-Reply-To: From: Navid Emamdoost Date: Tue, 26 Nov 2019 11:50:44 -0600 Message-ID: Subject: Re: [PATCH] drm/nouveau: Fix memory leak in nouveau_bo_alloc To: David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Ben Skeggs Cc: Navid Emamdoost , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ping... On Thu, Nov 21, 2019 at 12:09 PM Navid Emamdoost wrote: > > On Mon, Oct 21, 2019 at 4:14 PM Navid Emamdoost > wrote: > > > > In the implementation of nouveau_bo_alloc() if it fails to determine the > > target page size via pi, then the allocated memory for nvbo should be > > released. > > > > Fixes: 019cbd4a4feb ("drm/nouveau: Initialize GEM object before TTM object") > > Signed-off-by: Navid Emamdoost > > Would you please review this patch? > > > Thanks, > Navid. > > > --- > > drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c > > index f8015e0318d7..18857cf44068 100644 > > --- a/drivers/gpu/drm/nouveau/nouveau_bo.c > > +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c > > @@ -276,8 +276,10 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 flags, > > break; > > } > > > > - if (WARN_ON(pi < 0)) > > + if (WARN_ON(pi < 0)) { > > + kfree(nvbo); > > return ERR_PTR(-EINVAL); > > + } > > > > /* Disable compression if suitable settings couldn't be found. */ > > if (nvbo->comp && !vmm->page[pi].comp) { > > -- > > 2.17.1 > > > > > -- > Navid. -- Navid.