From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) (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 9820838BF61 for ; Mon, 15 Jun 2026 19:12:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781550731; cv=none; b=OqFptkNamQBHcfbXUjn1sBGULRpljZZLVHUiM/MfKWtcp+SQLgXXAGRd3jn1+JOCK/25RpARx4SAVW54Jcz6ym37qNIZ4pUWFd0aUV9SMk5pMUGjaV7YkZ1Yw5u5SnDmED75kY6CnuzKhiDBB9oM3SpfSsLD3BNdxZqyPcfcKE4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781550731; c=relaxed/simple; bh=DhEGEHzGVB5481N6DLfo4HUqkaEtZrVSwP10LakWkts=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=t64v24d5EIwHFxHiCLzclbJmSO1jdh6NFro4PBqOUYJt8UzOYLVWqp+ojfzXr5ed5lbFiwSA6A2uCJD81Grid5ACDXIPMHABqiLo4te3t8w46HI+EE13UlH4ATIEmAgn/0wqygXwSBAGERpFOQyDq4z3r6NL6o5oLR6CAR840kc= 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=ew0WSDM6; arc=none smtp.client-ip=209.85.222.176 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="ew0WSDM6" Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-91563382bcfso423220485a.0 for ; Mon, 15 Jun 2026 12:12:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781550729; x=1782155529; 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=isk5VSArpp3IPXJC+2cOjheoQad/XTpBKsU9Gm4z1ws=; b=ew0WSDM6oHz6YDEQBLv/LBPptoKxShsaJZ/P4YGwvd24VtCqXH5FXM0hOHSSOVIFFV /hwCq8qn/KuL1vo6CWkV9mojaFNR0pUbL7IpPTxKv+gJW1iXdGJhdRP8VHg4iwozWK0x wjbB0sDWqRkfLVo+rdiiNeJSi7dRgDv2g43RHb1zHqs1yrOvqANBGSNUgice2wmIVvJS wLc8RjGxfgQv4IA4Q3ept2L178DZGbzbh5V3VJZdOgsQgHnC6wV4mvSUsRVQxPwjkulH gyW8CWM6IAkgdw9JiGH65PRSZhxvzQMi81t4pFfG79N3f0Bzv8ZdCuWeUpjGqfZjvgIg VrMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781550729; x=1782155529; 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=isk5VSArpp3IPXJC+2cOjheoQad/XTpBKsU9Gm4z1ws=; b=a+czJiF9r1BkNCqIEyvp67hnZtDv5E3Ij2q4hBBbrERGD4VBrV2hlxhwGKXb/aU+8t LbsX2RDpYcE1R/m2kqWOUq0yU/B50OGW0lr6ZCsgigzD09V10njoYw+/BTwWS5A5CD0/ 7Bk6x+ojoF/T/kYoVXBX1CpQXch4oLye6ZkF4mVqMq6cJO/EidWgIQyrc3qTMykzoMIE wl1Xy3mHCqt3GUIvqfBTpVRVwxtI+xgkn1JhrnlbPtqQ2F+a3i14Xy6Cm/53tGh0/mbO HJVrhHMygMzbqsH446ZKFCBx14pVzO4IMghLuoG2ayM0oPK9FNOIMcxZCCm1MHBdMakd r8og== X-Forwarded-Encrypted: i=1; AFNElJ/nECq/Hs9QRyDYjLwkwRaErA/HFUA5Bt+pykxWAcUwgphWsGRSUuSj1EKR0ZeeBCeF/Lo8sJL/9QW0dhI=@vger.kernel.org X-Gm-Message-State: AOJu0Yzv/xEOzpqVVZEuZRpq5HE0KmdOGDUZgKSIemMJoiVm8RVmFvl/ XhboFBIV9kz1p2dRYJvZb3rg69YQJzVZPwdnR6h5sKkGjfV4F8pn8dkg X-Gm-Gg: Acq92OF7jxsNzvv/JlKzt5Y9si3pN6cmgtA/NsNMSxkew/EEXuulNF3pnNH8Lc+vvf/ 2HviPa0gE+WQAppoR9fnEIevPMP7Zzz9l4jG4/WXHvW5FXm3OltRwsJY5B96juKQPTChgeyplRB +19JGxDUX4+EvibZNsQ8kC87LvWo/zhpcQZSo6emMJlbHNFURbIyIZN8ezRtSPtsjiwc8amEFel dUxOYz00RyCnyDy4B30A4NHemNr21ywVz7tTW6/auyRp/Cs0e1AqSr6Qkuq04CbjEnVsRlqbk0x KJBRpWg8hTBB2jGwND+k5xkNzBpVe7Ypcx59hICsgbemxucXjpdgEG6EEJFp07+pEB3JpbdGGDU qXFH7ggHR6yYY+J2Ym5244Mghnvg0b9l7lX5rzil+/VkVpKWXYWTV9ugX4UFF3DxcGYEAJo8+DK 7VcEUjrxvzWUjuWEhG68DU3aKVSKxumwf8u4RV65aYlZxmyZMROIQ= X-Received: by 2002:a05:620a:19a1:b0:915:7f9e:a407 with SMTP id af79cd13be357-91c42cc5889mr69673285a.0.1781550729435; Mon, 15 Jun 2026 12:12:09 -0700 (PDT) Received: from i4-gl-tmk5904.ad.psu.edu ([130.203.156.186]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8d9f122b21bsm7547046d6.4.2026.06.15.12.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 12:12:09 -0700 (PDT) From: Yuho Choi To: Andrew Lunn , Sebastian Hesselbarth , Gregory Clement Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Yuho Choi Subject: [PATCH v1] bus: mvebu-mbus: Fix OF node reference leaks in DT init Date: Mon, 15 Jun 2026 15:12:05 -0400 Message-ID: <20260615191205.738388-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 mvebu_mbus_dt_init() gets the MBUS node with of_find_matching_node_and_match() and the controller node with of_find_node_by_phandle(). Both helpers return nodes with incremented references, but the function returns without dropping either reference. Route the error and success paths through common cleanup labels so both local node references are released once they are no longer needed. Fixes: 6839cfa82f99 ("bus: mvebu-mbus: Introduce device tree binding") Signed-off-by: Yuho Choi --- drivers/bus/mvebu-mbus.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index dd94145c9b22..61301beeecdc 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -1265,23 +1265,27 @@ int __init mvebu_mbus_dt_init(bool is_coherent) prop = of_get_property(np, "controller", NULL); if (!prop) { pr_err("required 'controller' property missing\n"); - return -EINVAL; + ret = -EINVAL; + goto put_np; } controller = of_find_node_by_phandle(be32_to_cpup(prop)); if (!controller) { pr_err("could not find an 'mbus-controller' node\n"); - return -ENODEV; + ret = -ENODEV; + goto put_np; } if (of_address_to_resource(controller, 0, &mbuswins_res)) { pr_err("cannot get MBUS register address\n"); - return -EINVAL; + ret = -EINVAL; + goto put_controller; } if (of_address_to_resource(controller, 1, &sdramwins_res)) { pr_err("cannot get SDRAM register address\n"); - return -EINVAL; + ret = -EINVAL; + goto put_controller; } /* @@ -1312,9 +1316,15 @@ int __init mvebu_mbus_dt_init(bool is_coherent) resource_size(&mbusbridge_res), is_coherent); if (ret) - return ret; + goto put_controller; /* Setup statically declared windows in the DT */ - return mbus_dt_setup(&mbus_state, np); + ret = mbus_dt_setup(&mbus_state, np); + +put_controller: + of_node_put(controller); +put_np: + of_node_put(np); + return ret; } #endif -- 2.43.0