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 E570421ABC9; Wed, 4 Feb 2026 15:11:55 +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=1770217916; cv=none; b=XHaI3FI3Tpgc4ZO9Tyuc6hM4llDZTpWHGOaUSLvWvBchZRu0f572syQVRo07fNFzr5eUPWqhxFZConhcVspLb8lNsESOEHgGfAcmMPAsW5vh0vYfU+LtieZD/y9wYSP+lE1Ato7BuNE/NE8aXzjRgHPIhZo4+wOS1d4snYSG/RA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217916; c=relaxed/simple; bh=l9fWT3YCwTPDFPHoMkuTaON1nW9Yepc7zcf6eoGNHos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XnN4d1M55e0Fl+BbA+/ToGsEguXts1zGzVFezqsupOgqX5YE4QFVJGdOZiXlglKZc6zXGRw0baNBkGtmH3xlMQumyLuOHkI7RFuge1BOpD/zkN8cBUt8SXnfD0hVxx5Bx1vLXd7TAKDiXZ3G9udeOuCObCnQgH+AjU5j/IR0ur4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=2azxMi/3; 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="2azxMi/3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E980C4CEF7; Wed, 4 Feb 2026 15:11:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770217915; bh=l9fWT3YCwTPDFPHoMkuTaON1nW9Yepc7zcf6eoGNHos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2azxMi/3t9mSc85EQWQGkBH3FBvlK4lfYHVcbHyOSzHE60+kjJ/h+6USIpzlBbjvd r18rYleIJ7Eb0lqHd1lObsJwSGnuz3CAI06BFeh2fqSIASmaQWdgK+DEfePrww5Sdg KBOWIgqegZ+q6ZFdTCKkoYCLo/2TtlpKSgKsi+f0= 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.1 156/280] of: fix reference count leak in of_alias_scan() Date: Wed, 4 Feb 2026 15:38:50 +0100 Message-ID: <20260204143915.241268112@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@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.1-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 @@ -1956,13 +1956,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);