From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C3A9D2DAFD7 for ; Fri, 1 May 2026 18:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777660034; cv=none; b=FHWn38fGut7PAkYfEeKx47UKqisSJojQnAdyL4Xi1+X8xGqq4xGVPhzGplJTRK98rnm0a+GexIGMGKy3HVR4QzH99WqTLnynOjI0BskcuMJ3jHBWaskkkyaGwVA6uBT+xkWpzprBfmTqioTXyG93nippzQWpgJHr9wZrKHaIijI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777660034; c=relaxed/simple; bh=Crg3MYdkRfYzuB3zF8YHtMuhVbuN31jOMiyZSmZEsAo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JcKGPHuCaWmaiZzKBk38uhtXWH4YR4WdrJwwrzLC6RR7vRqbSyRpEyPHlW9/Y7xIjFBFGQ6FKhk64lcxiFAIxAW0vhH4kCBe+tDxYHNohiVvUXIUIyqxIh92hXZ3auruSo3dBkFMHPWZS0penARrWC4oJPMQ9ZRcQqNpFsX8bIM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JM4DR96O; arc=none smtp.client-ip=209.85.160.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JM4DR96O" Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-50fb8e9a4edso25625181cf.1 for ; Fri, 01 May 2026 11:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777660032; x=1778264832; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vix+QZ1sPIdrflNMV7LNz3/oV3DD53W5TlBX1IA3HYM=; b=JM4DR96OM4AXSaPnXZ0V0G+bGuJc2YqG4yJ3V279KlM6iUbpuhWrWkBjnpeB77KHA4 Oa33oiwmKWVs+38fv0/YZLQdKyKblExSC9CGJRd3Sf6moucuhARCUl40Hjbjyv8vXEv7 3/22CSbYyTcj6RbA/8aW2RRqXLmgzIGMjfVRHYILDcKrTTc8ajMJFhoVYt1eQ7jqShIC YrPvClOCdzLQBbWPYVjA1ItBi8wAnVYo0A6K7NVLYT5UBTbW9yULH3CB8aIK/pbiDoRV ISdbsaTUaXyQa5B8YeWredZYmGtW/rW20XtJYVBCvVjqREgV39GS7z8yg1rgDuV4jeo0 JAOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777660032; x=1778264832; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vix+QZ1sPIdrflNMV7LNz3/oV3DD53W5TlBX1IA3HYM=; b=To99O7o/SqLtcN0dkGrDH/UGvSfSQYkp0zwR/6P1hNYJ7BF8kPdjqnYik5VNM/t3Yn wpqGMt5OS8fVHfiz6EYjiH4ug1d7qplR3U7HzA4KIreXsQwG9ra3ilzqoztKEQauJsLg fR7bCdWO0s16yLs3DqppeKaBwqArpzMzj47cW5XonNlhGpVslUco5oScylVQDeSyGKpQ K2PS2+JXWi4uM0GB+uOY5+qkvKK7+1pV/zZAY11hYOlyLIhYGq1KjgFTTI9ifrHZp/m7 lAk2T2zA3dYkvR+iEHhq8vzlH8JVaBboIdiOWro4eND4LofDvp7p/G3yRsMe36hxmkh5 UgXw== X-Gm-Message-State: AOJu0YwVwChWIv3WhRxpg+6aj/h9tNs+0d68ljE9H4NkLU5JbNwgLx5R iqJKnqNKUM/X6Rcv/bNnuckMr1TV4CmJF3s53pRNNJqUOAKt7ffmwuX9 X-Gm-Gg: AeBDievuSR7jcKurKyrzSooZIrcCp/g9/eJqXuo2dFq6rjhmrRh4HkdQ2c40ZW6Hycl m1PT9k6qptnZrtOtcmgpeHylYd+GcDxSSF+w2xxSBWsyH+NECBPyMfZD0jUWdJtXTg2JuScR2zb x2w9+5OFic2zgDo/00M4FyU/HKipT6UUiOkjqHBcxuV7Bf2H187LkCdJL4Vb6qEeJa6VYtUB39+ biKtBdZZJGvTgAzVqdmOibwenDpnxECPsprHehzQvEjqEhcfMbbJvrWcu1KzkwZenKIjcAgZ4h1 qawrhEWmC4fZEUl5xShcpfoRay2RiwCNgIN9r5NJjgTx7QiHNyGaPgipajWb2u/aVTFovQgt/ol YUyC0XmNVy+pfq3rfaei4u0rdo4icYs+IDnBdojNuFcXoRZM4VbVZ1/mZgsOXlIxv10HSZ/ip5U Bs1B8wSJceZVWklz8TISo7CcF2QGAi6hBJ3HkJxCSUEs3m7AzFya8= X-Received: by 2002:a05:622a:2304:b0:50b:86f5:8fbc with SMTP id d75a77b69052e-5104c034745mr5242691cf.51.1777660031573; Fri, 01 May 2026 11:27:11 -0700 (PDT) Received: from i4-gl-tmk5904.ad.psu.edu ([130.203.156.186]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8b5396c4b7dsm30960806d6.18.2026.05.01.11.27.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 11:27:10 -0700 (PDT) From: Yuho Choi To: Kees Cook Cc: linux-kernel@vger.kernel.org, Yuho Choi Subject: [PATCH v1] bus: arm-cci: Fix OF node refcount leak in cci_probe() Date: Fri, 1 May 2026 14:27:07 -0400 Message-ID: <20260501182707.2668421-1-dbgh9129@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit of_find_matching_node() returns a device node with its reference count incremented. cci_probe() returns without dropping that reference when the matched node is unavailable, when controller mapping fails, and after cci_probe_ports() returns. Route all exits after the lookup through a common cleanup label and drop the node with of_node_put(). This is also safe for the no-match case because of_node_put(NULL) is allowed. Fixes: ed69bdd8fd9b ("drivers: bus: add ARM CCI support") Signed-off-by: Yuho Choi --- drivers/bus/arm-cci.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index 7f2baf057128..f5993380d511 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -538,8 +538,10 @@ static int cci_probe(void) struct resource res; np = of_find_matching_node(NULL, arm_cci_matches); - if (!of_device_is_available(np)) - return -ENODEV; + if (!of_device_is_available(np)) { + ret = -ENODEV; + goto out_put_node; + } ret = of_address_to_resource(np, 0, &res); if (!ret) { @@ -548,10 +550,15 @@ static int cci_probe(void) } if (ret || !cci_ctrl_base) { WARN(1, "unable to ioremap CCI ctrl\n"); - return -ENXIO; + ret = -ENXIO; + goto out_put_node; } - return cci_probe_ports(np); + ret = cci_probe_ports(np); + +out_put_node: + of_node_put(np); + return ret; } static int cci_init_status = -EAGAIN; -- 2.43.0