From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-170.mta0.migadu.com (out-170.mta0.migadu.com [91.218.175.170]) (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 037DA3BCD20 for ; Fri, 3 Jul 2026 10:42:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783075351; cv=none; b=G7X29ZatlTJDMJXmNvl225O+LL4Ck+jFLnQ76rwX2PP47PNbnLeyrEW0HgKkLcSNy+8Ok9Keld/RtuQLuyHvA8aM5Z++byUqkq7rDRxTEeew0VBSW4QlhpwcZUQNwRTtUP+vnM2JM0U8wGMmwE65Nw9qUj5atHEHxELWNkfte7Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783075351; c=relaxed/simple; bh=y9TZypuTsViLurUr/O/LLHu+C57FU2NtKKg023NLEV4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=EudEuOQVdlHtsJ0AaAUhB2qF045JFpgrN7vXBTNixKly6jFUtCXNB9APcSYdQXyD2dxV5iKKy4LNlTJvkUNfe28mL4gjGlfyuuynbzseVpYiaz5g4XGPPEi1I2zxz2fyeaxwopYZvNEoFASAbL0vmWL6tcRuTB4i1cIx5e6pqyo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=PjaGuWCM; arc=none smtp.client-ip=91.218.175.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="PjaGuWCM" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783075346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=IErgOCnY357EdDsvHsbdxH5kQFV9ptIXeCqdksR3JFQ=; b=PjaGuWCMQ5Z9bxU5aLGaW9YuAYEwMv2+XTf5jLNkAnKtiVt2M05n4pfTPpWg4lh8nwh68r kPNDSgJAi1otYtU9xhPo28qnPfFUE1TMa+xGmibjw4u0Ao8eTyDx9VvOBm1VyBLxEaopr5 5BMUt6NVSBv/4YMoo5eo6bjwp2isaYw= From: xuanqiang.luo@linux.dev To: intel-wired-lan@lists.osuosl.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Nguyen , Przemek Kitszel , Andrew Lunn , Joshua Hay , Tatyana Nikolova , Xuanqiang Luo Subject: [PATCH iwl-net v1] idpf: fix lan_regs leak on core init failure Date: Fri, 3 Jul 2026 18:41:32 +0800 Message-ID: <20260703104132.47419-1-xuanqiang.luo@linux.dev> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Xuanqiang Luo idpf_vc_core_init() gets the LAN memory region layout before mapping the regions and allocating vport resources. Both layout paths allocate hw->lan_regs, but later error paths return without freeing it. idpf_vc_core_deinit() does not cover these paths because it returns unless IDPF_VC_CORE_INIT is set, and that bit is set only after core init succeeds. Free hw->lan_regs on the post-allocation error paths and clear the pointer and region count. Fixes: 6aa53e861c1a ("idpf: implement get LAN MMIO memory regions") Signed-off-by: Xuanqiang Luo --- drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c index be66f9b2e101c..da49bb7b7e671 100644 --- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c +++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c @@ -3479,6 +3479,7 @@ static int idpf_vport_params_buf_alloc(struct idpf_adapter *adapter) */ int idpf_vc_core_init(struct idpf_adapter *adapter) { + struct idpf_hw *hw = &adapter->hw; int task_delay = 30; u16 num_max_vports; int err = 0; @@ -3550,15 +3551,18 @@ int idpf_vc_core_init(struct idpf_adapter *adapter) if (err) { dev_err(&adapter->pdev->dev, "Failed to map BAR0 region(s): %d\n", err); - return -ENOMEM; + err = -ENOMEM; + goto err_lan_regs; } pci_sriov_set_totalvfs(adapter->pdev, idpf_get_max_vfs(adapter)); num_max_vports = idpf_get_max_vports(adapter); adapter->max_vports = num_max_vports; adapter->vports = kzalloc_objs(*adapter->vports, num_max_vports); - if (!adapter->vports) - return -ENOMEM; + if (!adapter->vports) { + err = -ENOMEM; + goto err_lan_regs; + } if (!adapter->netdevs) { adapter->netdevs = kzalloc_objs(struct net_device *, @@ -3624,6 +3628,10 @@ int idpf_vc_core_init(struct idpf_adapter *adapter) err_netdev_alloc: kfree(adapter->vports); adapter->vports = NULL; +err_lan_regs: + kfree(hw->lan_regs); + hw->lan_regs = NULL; + hw->num_lan_regs = 0; return err; init_failed: -- 2.43.0