From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 999C92FF178; Wed, 28 Jan 2026 15:58:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769615924; cv=none; b=Uumly3M73vuTDFmaMgLC5oFTRnEhkwJOtx0sTvvpOHNF6v8ka7CYG7rP8pwIGK2PsA64yfhnLxO/pdc4AtWhHqmEAFY+vQEIi7OX047tgutPQeeVH96U00s7VgI83S2I1C2ci8oQtLGcO1T/rXT7/zl85C9wXBybIwZVDRWzw34= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769615924; c=relaxed/simple; bh=LzH87bqw7EJFkAgJbi677saVRDJPFNIFsg5QF136M3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D7jDnKNVIvBbHI/0LuGMjrHMjL3JUzdmE5e2p0NriaRK3GJs3g/ND1vCIfMc1GBQKBh24Y1j09Kqcfu7WRlXjcBTjeFt18ndiX9qZlSeTpRNKb90SWJINB1cvHsCMzjgLN38KOfueayTG2pbfO5FLFsdNhgebTIjLiCVf2vVkVg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=s6ybalRA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="s6ybalRA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17DC6C116C6; Wed, 28 Jan 2026 15:58:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769615924; bh=LzH87bqw7EJFkAgJbi677saVRDJPFNIFsg5QF136M3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s6ybalRAE22xly3fDOh20TWULQf8H64yy+7hKPfINjntrHafrNYQIU2AkqCDVN64Q cl1sG4+dCdZa4rd6rY8rmThCSd5Cw6RfNEL2FTRo7h2cmWDREF17ztWDz6tJ16Q07s D6tzWAUT29cCVuRO+vEDx6AiIrQdowMXY9600Jxg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Weigang He , "Rob Herring (Arm)" Subject: [PATCH 6.18 154/227] of: fix reference count leak in of_alias_scan() Date: Wed, 28 Jan 2026 16:23:19 +0100 Message-ID: <20260128145349.995610682@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260128145344.331957407@linuxfoundation.org> References: <20260128145344.331957407@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Weigang He commit 81122fba08fa3ccafab6ed272a5c6f2203923a7e upstream. of_find_node_by_path() returns a device_node with its refcount incremented. When kstrtoint() fails or dt_alloc() fails, the function continues to the next iteration without calling of_node_put(), causing a reference count leak. Add of_node_put(np) before continue on both error paths to properly release the device_node reference. Fixes: 611cad720148 ("dt: add of_alias_scan and of_alias_get_id") Cc: stable@vger.kernel.org Signed-off-by: Weigang He Link: https://patch.msgid.link/20260117091238.481243-1-geoffreyhe2@gmail.com Signed-off-by: Rob Herring (Arm) Signed-off-by: Greg Kroah-Hartman --- drivers/of/base.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1895,13 +1895,17 @@ void of_alias_scan(void * (*dt_alloc)(u6 end--; len = end - start; - if (kstrtoint(end, 10, &id) < 0) + if (kstrtoint(end, 10, &id) < 0) { + of_node_put(np); continue; + } /* Allocate an alias_prop with enough space for the stem */ ap = dt_alloc(sizeof(*ap) + len + 1, __alignof__(*ap)); - if (!ap) + if (!ap) { + of_node_put(np); continue; + } memset(ap, 0, sizeof(*ap) + len + 1); ap->alias = start; of_alias_add(ap, np, id, start, len);