From patchwork Mon Oct 24 11:32:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9523 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp483185wru; Mon, 24 Oct 2022 07:26:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yyCJCrqlO662Jcc1gjcHDuBdtF6koXfqL33lTqz/xQe62Ttv3L6jcfizI3l0sYVcqPxfa X-Received: by 2002:a17:906:5dac:b0:791:93de:c61d with SMTP id n12-20020a1709065dac00b0079193dec61dmr27271013ejv.751.1666621608000; Mon, 24 Oct 2022 07:26:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621607; cv=none; d=google.com; s=arc-20160816; b=Qf/BmNUR6gg0DlkeZGaeL+eyEtfSZW2rTY9Q/b6SYBiIo1Zi0rSwB/xEf7+5K/gfri FcvYqrynEHYdYsShx0VJXaIHjCS6XMlGvkU/nDG+2PHUcpo2KmOONFfpjXzPlX4s7sJE lz5jSRpYFYgBd7qpx1yn4vPKBSO4CHyJ3FOSle6u9B49NrAK2GoQnyYVHKX7wgzL9YFC B3VEAlRwka/FYshqCIneH5P116szAzFVftpn/8uWznPM1IfezY5K+HL6iW/yJsxLrn/y BBe+FxDBMM7ntcuwRPKx6k3jxBs0M1K859ZnoNgURbdfGQZqWgVCf7NqhFZOSq41pHMW e+tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=86Tzfm407mQTA/k5JCLfS2ZDe8GlqE9oSkmvMF4v0/c=; b=aznOB2ym0RivcRj9idvMo1/BIMyYhdIc+VKaC/o4O/PrOeo+fiBiPtMN3RlGRuQmYb VBzP6RK0NySQE+TU56fc+wyoPMmdw4yMALx5McC9cwAF5K9VIvTQrG9XWmRmPGeqtDHB WD11dW4fivrMzxtfsctOZUUWta2EZ+CffNkOBKxu1d8l7RD6BEt88kxhK6n/h650olVx DdpYma+qZlncrelnROGweSaYbRTeoNGfFDwl5RqZhUUKu+UDqoHeMP/RCvs8SChO90cO xKTxHQ5QbZXzZmAVqsg/xPs6XzeqVdfKdjLtamS+6v9xT9kh0wt7tp0e69N7/uDfUjHw 2a5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=x+ZoV3Wj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f22-20020a0564021e9600b00461e582ef0fsi1890669edf.381.2022.10.24.07.26.23; Mon, 24 Oct 2022 07:26:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=x+ZoV3Wj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235790AbiJXOWI (ORCPT + 99 others); Mon, 24 Oct 2022 10:22:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237224AbiJXOQT (ORCPT ); Mon, 24 Oct 2022 10:16:19 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F91432A9C; Mon, 24 Oct 2022 05:55:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 703ADB8169F; Mon, 24 Oct 2022 12:30:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE310C433C1; Mon, 24 Oct 2022 12:30:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614605; bh=+AaMpEEtbRsAd0445XliC1VO8cMNV1cNMNF7QtsWu+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x+ZoV3WjLOVh/2nS41UW854bP+ESWH0t+f9jlv/RA3hTZPj6Gj9hWjRwdS7c8uuYm 4yVnJRIz5hvxzsyCGkd0r2GqQqS6J4iABqIeMejaemSuDvP93M5gGbpcSNQCMQV+Cv FAKTiwN/Njy4bCU8xEYJQ+j7q06i+E18MTw7E5VI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jianglei Nie , Lyude Paul , Sasha Levin Subject: [PATCH 5.10 325/390] drm/nouveau/nouveau_bo: fix potential memory leak in nouveau_bo_alloc() Date: Mon, 24 Oct 2022 13:32:02 +0200 Message-Id: <20221024113036.839853734@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747579419485776990?= X-GMAIL-MSGID: =?utf-8?q?1747579419485776990?= From: Jianglei Nie [ Upstream commit 6dc548745d5b5102e3c53dc5097296ac270b6c69 ] nouveau_bo_alloc() allocates a memory chunk for "nvbo" with kzalloc(). When some error occurs, "nvbo" should be released. But when WARN_ON(pi < 0)) equals true, the function return ERR_PTR without releasing the "nvbo", which will lead to a memory leak. We should release the "nvbo" with kfree() if WARN_ON(pi < 0)) equals true. Signed-off-by: Jianglei Nie Signed-off-by: Lyude Paul Reviewed-by: Lyude Paul Link: https://patchwork.freedesktop.org/patch/msgid/20220705094306.2244103-1-niejianglei2021@163.com Signed-off-by: Sasha Levin --- 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 b4946b595d86..b57dcad8865f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -279,8 +279,10 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain, 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) {