Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4769684ybg; Mon, 21 Oct 2019 14:16:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqxnkphETUdUS6DtIyZ8tGFDPCLE5S9OD7uOgQSDIMp4Q4tkTW4q7uNR8/WkJZ8elERgZiJp X-Received: by 2002:a17:906:27ce:: with SMTP id k14mr6314129ejc.72.1571692566150; Mon, 21 Oct 2019 14:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571692566; cv=none; d=google.com; s=arc-20160816; b=jUwEqT0R/D9UDTeqKCyxvH9r9UNtNSOm+xTc7Jblj6gzpq3EvZ4e4mlngvruYxppCV O1r3qMpqTeRHItrK5xZAnEmD682VOOBhyymwmIcKq3rH3ezDtRMSG53AkBr5dnttvlXs 3lB1JhwEtFMwTHm+tITgPYm7ojN+IlFG7KDT4gaRy7xqwqAGgEmT94CXQ24maTWc/yyx mi+R10n7vDhCD3ZedJmA0fgXYMymhJegK/EsJElqcn6DBUGsY4IrYEgpk9+5tv/53d1u Pwxce7MBKwxXsCgKNtXYUzUtDK4WA61k5Y7DmhnUy7ipGyC0unH49ImFiIBu4qZbj45S 0y7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:message-id:date:subject:cc:from :dkim-signature; bh=LR3+seWWFASqTSZQrCeqQuAxv454H5+n1q+3KOFbBcs=; b=lTtuB8534AaDfx4u+6O6kes59vL1/hdvoWJvsg3RMJM+fOXOdTxUWVutqcFo/i85NV ZMlNWJDQEPy2lW55gonNEf1o+OYqBbQWVAI6G5hkrZEP1/rNTJDOLTzPdvQfNNacPEuw BKxqGe3Q1JCSkT4YjwzclZ3EPaFHeJ/h2vMVf95eY98aidCb8GgroM2S7F/kxJNMZAt8 vxLEoEbyKLfU9IuylWGXTYTRqAD4F/IsTFgOUjdnmcbbzyVB1nL0j4rEz2O/pi0H734/ wsQz4pr6lIKEqUDkQ0HsY/d5tNnIou2hCRYicdlrWYJwc3tSF4pFhzQpB0mvKiuzKmd4 xHvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=G1I6gh7o; 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=fail (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 w43si11447034edd.332.2019.10.21.14.15.42; Mon, 21 Oct 2019 14:16:06 -0700 (PDT) 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=fail header.i=@gmail.com header.s=20161025 header.b=G1I6gh7o; 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=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730289AbfJUVO7 (ORCPT + 99 others); Mon, 21 Oct 2019 17:14:59 -0400 Received: from mail-il1-f195.google.com ([209.85.166.195]:39180 "EHLO mail-il1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726672AbfJUVO7 (ORCPT ); Mon, 21 Oct 2019 17:14:59 -0400 Received: by mail-il1-f195.google.com with SMTP id i12so2897667ils.6 for ; Mon, 21 Oct 2019 14:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=LR3+seWWFASqTSZQrCeqQuAxv454H5+n1q+3KOFbBcs=; b=G1I6gh7o/OFhK2+ufBpndx46sR9cyY67N6CBxIyxkgWvcaRC5RoOzDnEuqkOFFZ9Xh G2lGR9XhD9UJd43XoN6GjpKobREtEatr0444g4HiQ0vIp6qcNtT9izy8dxqFp7CXKHce 8ZBaD4kQTeheSROXlCqCHJqYicJ5iQ9VeVlwsT+l0LYnADQQy12XeEgxz24VbihIbmas EBjpvrrl1tTvDVxNOoo+e8t7++Ptu20ey5KWx8LMT5lgriVDB4E5qG+qhKZbKmv0K1nQ sj6wWW0LedhBb9aXveHWrW2drichJEGv+dQwI930GHMCZji2BtPwr2uJu7Pbcz+SohQR h8iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LR3+seWWFASqTSZQrCeqQuAxv454H5+n1q+3KOFbBcs=; b=K1dW2EdisHjdiR/XxHVZS2ZxOQPPcatCALh1iZX9T8syWtYR0IVkwHvagwrVSwSzu/ 7CXzyTumYVoa8CLlhhZW9ns4aoRBZM4NWSgwA+jzTgeFTMgiMpGD7bVxk1qJhUr47K8o oaJBRFdxJL33HchjIiY6weUVeQAMRNSJqHGu4Vq35vLNbmsa+Fb/sFfgtzShToYNf8hY gGzbd+Q76YIEnUYFEptPXSefVg7vjW2gZPWpW8lKuqZthoJNlWe7ZnvaSvbTrp9Eu5cV 5IomvGjQb9qCBfX6m+itFHmDP+pdBqf5oOgXMs/qbWzaknYselDIQXrTiedmOnWBJSv7 5sGg== X-Gm-Message-State: APjAAAWRfPn2T3KYav4kYcTtjlsEShGP6jk5hdTO+Mla/0V6ZRWgbZ0A DEz9Cu39unt6mlMotXTjtag= X-Received: by 2002:a92:5b16:: with SMTP id p22mr29585825ilb.226.1571692498435; Mon, 21 Oct 2019 14:14:58 -0700 (PDT) Received: from cs-dulles.cs.umn.edu (cs-dulles.cs.umn.edu. [128.101.35.54]) by smtp.googlemail.com with ESMTPSA id m9sm6722618ilc.44.2019.10.21.14.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 14:14:57 -0700 (PDT) From: Navid Emamdoost Cc: emamd001@umn.edu, kjlu@umn.edu, smccaman@umn.edu, Navid Emamdoost , Ben Skeggs , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau: Fix memory leak in nouveau_bo_alloc Date: Mon, 21 Oct 2019 16:14:48 -0500 Message-Id: <20191021211449.9104-1-navid.emamdoost@gmail.com> X-Mailer: git-send-email 2.17.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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