From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 597E9C4321E for ; Mon, 20 Sep 2021 18:23:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43C25613D3 for ; Mon, 20 Sep 2021 18:23:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352425AbhITSZS (ORCPT ); Mon, 20 Sep 2021 14:25:18 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:46766 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377384AbhITSSf (ORCPT ); Mon, 20 Sep 2021 14:18:35 -0400 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8560F3F4BE for ; Mon, 20 Sep 2021 18:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1632161826; bh=TjtorBP1QG+MBkByGdZNpa22mOVzwIsICVZSplyAbbE=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=aM+Xf4yDN35MlZk4MjNWS6NRK4aeW3VBzWN+JrX0G/iyTbSewqSn7Fw4YYr4kEqe6 Yvn+pQMDEXg8ZJVg1PEWk+DFPTR2t8d2RchPdUoerdit8uNWKpn/9hQKRkZTyFPzbj YVdFN1HVkXLH4dHwxSuxYmUq71Iuu957dIf8KmlEKDQoA9sYsaiGJbDW83Aw+elffL N2eD6VocivuPbpVHhiK3YKBhiduzbNQPaQvWec8FHz1MKWXqzJGTdh+kaSpPjqVCCE U1+8V/fjuLTx1Z+7d7XkKbtwMU9ERXqSRjlciyVOP0pt4li7CQUIBJ1Q+MhlvsqPbK TSNKQjGHu37ew== Received: by mail-pj1-f71.google.com with SMTP id h1-20020a17090adb8100b001997671e011so12594491pjv.4 for ; Mon, 20 Sep 2021 11:17:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TjtorBP1QG+MBkByGdZNpa22mOVzwIsICVZSplyAbbE=; b=yPIf83ivJHYM8THTDtYRTNMSgkyRJWuxndrf69JDPccZoex4qb/Bimd6ed4j21R6qQ X2621KalwCqkoTPPzPsHof5ZQrCEAz5ERMpo7vAcupV1cQmYhl5N12+PXau6hJHiHEKs NfHNkmj2CTmjZ5TebZdcbS82cek4SY+1cWiUrEJY1HmGPxnAoQIhBJugPMe8HhtW9oaA NLJxh9fW5QYN7jG7mKU54XqfK621W3UolPvdUVKvIXsd8SxsDxObMNWK25O4eSjWL1si x0zZwwJz77i/qARXaSmc23O5yJRWUidKGdrYWNOprJbokwcBsngq1/NVblgp8tlMPpSU CDhg== X-Gm-Message-State: AOAM532Q3iTJu9qh+bDj8G0JykBltfVGlfW5B+X4HWagWiQZRkuYQmXk v7oYqLIhKjQPef2xvryxhYwGo7AVJqh7zChvLuUU3HXNpDfFjqhwNTYOk/1RgRUWvuq00qfll+X 8v+C//HP2UAzWJ177KF/AKCVxM8xkzz+B5reoFG09dg== X-Received: by 2002:a17:90a:24c:: with SMTP id t12mr357831pje.103.1632161824738; Mon, 20 Sep 2021 11:17:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDHbTX6MS7FWBtqKRkGWZ8SYTluchgpjHnl329yBqjyNyrGnU2x+2LHi5jaLReYrYUZHW5Fw== X-Received: by 2002:a17:90a:24c:: with SMTP id t12mr357801pje.103.1632161824463; Mon, 20 Sep 2021 11:17:04 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id m64sm16126877pga.55.2021.09.20.11.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Sep 2021 11:17:03 -0700 (PDT) From: Tim Gardner To: nouveau@lists.freedesktop.org Cc: tim.gardner@canonical.com, Ben Skeggs , David Airlie , Daniel Vetter , Karol Herbst , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/nouveau/ga102: Free resources on error in ga102_chan_new() Date: Mon, 20 Sep 2021 12:16:47 -0600 Message-Id: <20210920181647.22156-1-tim.gardner@canonical.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Coverity complains of a resource leak in ga102_chan_new(): CID 119637 (#7 of 7): Resource leak (RESOURCE_LEAK) 13. leaked_storage: Variable chan going out of scope leaks the storage it points to. 190 return ret; Fix this by freeing 'chan' in the error path. Cc: Ben Skeggs Cc: David Airlie Cc: Daniel Vetter Cc: Karol Herbst Cc: dri-devel@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Tim Gardner --- .../gpu/drm/nouveau/nvkm/engine/fifo/ga102.c | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c index f897bef13acf..4dbdfb53e65f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga102.c @@ -175,19 +175,21 @@ ga102_chan_new(struct nvkm_device *device, } } - if (!chan->ctrl.runl) - return -ENODEV; + if (!chan->ctrl.runl) { + ret = -ENODEV; + goto free_chan; + } chan->ctrl.chan = nvkm_rd32(device, chan->ctrl.runl + 0x004) & 0xfffffff0; args->token = nvkm_rd32(device, chan->ctrl.runl + 0x008) & 0xffff0000; ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, 0x1000, 0x1000, true, &chan->mthd); if (ret) - return ret; + goto free_chan; ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, 0x1000, 0x1000, true, &chan->inst); if (ret) - return ret; + goto free_chan; nvkm_kmap(chan->inst); nvkm_wo32(chan->inst, 0x010, 0x0000face); @@ -209,11 +211,11 @@ ga102_chan_new(struct nvkm_device *device, ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, 0x1000, 0x1000, true, &chan->user); if (ret) - return ret; + goto free_chan; ret = nvkm_memory_new(device, NVKM_MEM_TARGET_INST, 0x1000, 0x1000, true, &chan->runl); if (ret) - return ret; + goto free_chan; nvkm_kmap(chan->runl); nvkm_wo32(chan->runl, 0x00, 0x80030001); @@ -228,10 +230,14 @@ ga102_chan_new(struct nvkm_device *device, ret = nvkm_vmm_join(vmm, chan->inst); if (ret) - return ret; + goto free_chan; chan->vmm = nvkm_vmm_ref(vmm); return 0; + +free_chan: + kfree(chan); + return ret; } static const struct nvkm_device_oclass -- 2.33.0