From patchwork Tue May 11 08:28:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 434167 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3609368jao; Tue, 11 May 2021 01:29:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwt7aNoiA94rwXlttL6LrUCTGK0G1JQea0LvnLrAGtPmMb8BAY0NoFyhX0IR235b6NFKSwn X-Received: by 2002:a17:90a:77c8:: with SMTP id e8mr4016020pjs.69.1620721750341; Tue, 11 May 2021 01:29:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620721750; cv=none; d=google.com; s=arc-20160816; b=nZYlSgu2AhpypyuzoDXuXOaBATBqniOtjeED1tonl7jmoCxzG/Ef1Q9v5mJuXGpBPq U63E+aw7NV6KJawdke7LFvpLpnpJVMp5hpPzr2Dkhqixi8zi68+dNIjce0o3GIhNJ/9j Y0xfMkO8ggR241dXX1/2xhr0glpWXFDohZPWPd9V4andH8xXg8mgoLZ9AqAegUHqKKFG hIyfwdeNpAvQRff4fzf5eG/RUMx6Gw8Ma8afF59qDKmSIalHTInL9JoL7tLmemDtfgan sZLxMT43sZ/oX2VCdTEkNQCzqIS6cFtGI32pl+mXEHPToj7UJB/hDTYVy7zleHHErNRe QJ5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :delivered-to; bh=jl15kt/CQLJW7ikImHZ9VNVOB9PBB5zoexvJ5Uilutk=; b=hzQWUPqYiFBSaLukN6+kwEp0C0YbQIJeEvnNeFLbXbSaUwNpz/LUC2qbjAqec8k1xG FvBuyZepsUxgnTgaqjKGVKdwCexrrlGKJ8dQhHHhbzN8oSV63y6H5vGEfwB3zQqsebr8 7vnIAXI/8DOwgJC+dSfCOg2Cu1XpYkNg2/Qz+wCkR+zQpNyPDdr6ZS18RCbKDinR0f5f /vfFR1E4jjVSm9WCPPjTobBTeYuAcohBZHmE6Ru3nKFOEy83OowvE5Qqogo8NTXi2l0m L1MO342NIIIzcZTuXxSevgv97R9gTmPpM3qjI1VuFSwZTwv+rfBUK4RhKXXOSBXA1bnw Uqkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id ot4si2374922pjb.158.2021.05.11.01.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 01:29:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB0DA89FC8; Tue, 11 May 2021 08:29:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A4756E51B; Tue, 11 May 2021 08:29:06 +0000 (UTC) Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FfWHK1DLbzlZFK; Tue, 11 May 2021 16:26:53 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.72) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.498.0; Tue, 11 May 2021 16:28:56 +0800 From: Zhen Lei To: Ben Skeggs , David Airlie , "Daniel Vetter" , Pierre Moreau , dri-devel , nouveau Subject: [PATCH v2 1/2] drm/nouveau: Fix ida leak Date: Tue, 11 May 2021 16:28:40 +0800 Message-ID: <20210511082841.4181-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210511082841.4181-1-thunder.leizhen@huawei.com> References: <20210511082841.4181-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.177.72] X-CFilter-Loop: Reflected X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhen Lei Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" When the 'nb' value allocated from 'bl_ida' is greater than or equal to 100, it will not be released. In fact, we can simplify operations by limiting the range of idas that can be applied for. By the way, delete the const modifier of the local variable 'nb'. Fixes: db1a0ae21461 ("drm/nouveau/bl: Assign different names to interfaces") Signed-off-by: Zhen Lei --- drivers/gpu/drm/nouveau/nouveau_backlight.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.26.0.106.g9fadedd diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index 72f35a2babcb20e..d1c998e645fb4b6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c @@ -51,8 +51,9 @@ static bool nouveau_get_backlight_name(char backlight_name[BL_NAME_SIZE], struct nouveau_backlight *bl) { - const int nb = ida_simple_get(&bl_ida, 0, 0, GFP_KERNEL); - if (nb < 0 || nb >= 100) + int nb = ida_simple_get(&bl_ida, 0, 100, GFP_KERNEL); + + if (nb < 0) return false; if (nb > 0) snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb);