From patchwork Wed Mar 5 21:57:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 14003502 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 A55D3265626; Wed, 5 Mar 2025 21:58:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741211890; cv=none; b=kwXcoOaY7snzjgrNo90Lw/SdFeY9EGa3JiMt1IG1q3e0RYL7/GI0MXV5TxEvtaA+TBDwxaxMXMZi2DJtlcY724Itbz6LJ+CzuLpC9UZL+cpEiWpxTvQlZTWhMKiJO2mBcqL4T3pMNq+7BY8n5CHmaOmYBoAlB4SSmr4R8612nH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741211890; c=relaxed/simple; bh=p6yLNxB6AEQQRxBA+8RH4XuP3uDaZMNLWaAcrErt+6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fxELlYWAMwwU8AVHiGbXu7s+D5I8fUIZ64EF5rhLwORlKIKcGMFOxIJlgnBgN8NMzwx2LrqjOAiPcwN1iTIWWkSQed8aWXtVl9do5hshYbCL4PbSqQZ82QxVk1qJSfrr1Yt4PQfIyAkebz42FNz3wes1D0L2h/AQ6OfgrACRP9g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Wgh+wyVe; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Wgh+wyVe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741211889; x=1772747889; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=p6yLNxB6AEQQRxBA+8RH4XuP3uDaZMNLWaAcrErt+6M=; b=Wgh+wyVeKqZhjRs+5LWVLs0qjxC1I7xIubI6h+V59ueu6D44OVNj9m10 JVWboXK/kVVkZVMdd2Xo8S+SyYQj2TpoW8t+sHRUhPX0XUnCbkYcjzmbj N8cRj3Mok+ylrkg3BHHpr5tJhXwXF/zyv5NLnqpKoXS1R0jzT0hoSZ9A8 Lp9/0Mi9shM1EcXr+trEtm4Es99L3+GqS7AXWkutuHclHpaAGqtwops2R 7XaIbKDYxIZnJXLUYpO8Ah30FYrjIgquOOnuNTfovhBmF66M9Ns0m05+I TbveX4s3+gJsej8MXJ8KtMgN6sbRO+htL//Ywg55Af4SZIkffl+6c2uMn w==; X-CSE-ConnectionGUID: /Lu1r38CT9O9HXPaUz7NAg== X-CSE-MsgGUID: BqLo6NOOTZGzeoaNzyxeKQ== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="29782156" X-IronPort-AV: E=Sophos;i="6.14,224,1736841600"; d="scan'208";a="29782156" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 13:58:06 -0800 X-CSE-ConnectionGUID: N43XDm/pThuzAeDELzNDcA== X-CSE-MsgGUID: v2JHils4R0eoSuaclvrYHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="118741661" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa010.jf.intel.com with ESMTP; 05 Mar 2025 13:58:05 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Dan Carpenter , anthony.l.nguyen@intel.com, michal.swiatkowski@linux.intel.com, jacob.e.keller@intel.com, tatyana.e.nikolova@intel.com, leon@kernel.org, jgg@ziepe.ca, linux-rdma@vger.kernel.org Subject: [PATCH net-next 1/2] ice, irdma: fix an off by one in error handling code Date: Wed, 5 Mar 2025 13:57:52 -0800 Message-ID: <20250305215756.1519390-2-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305215756.1519390-1-anthony.l.nguyen@intel.com> References: <20250305215756.1519390-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Dan Carpenter If we don't allocate the MIN number of IRQs then we need to free what we have and return -ENOMEM. The problem is this loop is off by one so it frees an entry that wasn't allocated and it doesn't free the first entry where i == 0. Fixes: 3e0d3cb3fbe0 ("ice, irdma: move interrupts code to irdma") Signed-off-by: Dan Carpenter Reviewed-by: Michal Swiatkowski Signed-off-by: Tony Nguyen --- drivers/infiniband/hw/irdma/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/irdma/main.c b/drivers/infiniband/hw/irdma/main.c index 1ee8969595d3..5fc081ca8905 100644 --- a/drivers/infiniband/hw/irdma/main.c +++ b/drivers/infiniband/hw/irdma/main.c @@ -221,7 +221,7 @@ static int irdma_init_interrupts(struct irdma_pci_f *rf, struct ice_pf *pf) break; if (i < IRDMA_MIN_MSIX) { - for (; i > 0; i--) + while (--i >= 0) ice_free_rdma_qvector(pf, &rf->msix_entries[i]); kfree(rf->msix_entries); From patchwork Wed Mar 5 21:57:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Nguyen X-Patchwork-Id: 14003503 X-Patchwork-Delegate: kuba@kernel.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 2D9D9265635; Wed, 5 Mar 2025 21:58:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741211890; cv=none; b=QyymlcdDPGVeKFf/vzHOKUqHgC0xSY6Up2fAwN+bVw8GrQIrmotwR1ZZ5sWEBwV90pp4D8Jm20CCnDgnUE7OEcA80CGrXuMvOdyKEKcslJi0htBK9+FIeIBTX8NHmmGFloHCi7DiGJ0D3/FOVtHQl/DlqYVTu2azqGCtIISjmRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741211890; c=relaxed/simple; bh=YtN9hyJWflxYKrfouDqhZZNXrLwx9v59K9kMzD86Tus=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Frov9PCA/owRLnmtSLEFX5Nmi529DZZ98HDNNWQYtaEQoixg3NyXw6KTqwD1n6Xq+Ik+NORv6824+TPH4h0aijIFFmaV3cnsFbSCHVmYeE5nFWaPIciBacKZ0m4VhuqImZxfrtBlR8K1EDSbcxpM2NBMwq8b7MgjiEZ8+dHm568= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=E+D6LeRh; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="E+D6LeRh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741211889; x=1772747889; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YtN9hyJWflxYKrfouDqhZZNXrLwx9v59K9kMzD86Tus=; b=E+D6LeRhqfchuMemmktdumQ6MpESVVfemMCy4LB6bwNr5OhRNX651x6p f43QhX1RgXC05HZw26WKOxrAWbUbSwEiRrY2TP4lprhdQ5TSQ9NRiXxs1 1iD1ItiKNkRtmExxP/119z5UmYvrsD4O7aZAk5Cw0rMGcMLPcWwyO6EDZ EUGZAzGyHR+rko37Hasfx6lOCBDeaYV+PJL1Ojw5gv3MM3y3ZxwLATN6W uKDkooLehHbBp2khnQH4kpdaxDKqbky4FA+tUydbqixyeRUQSkVtaiKSH 9XU3Hu8VdzHORvkI7ikx0p2jghsnB5OWNWJ4wae/Ctbs6E+KOwJvE/CV4 w==; X-CSE-ConnectionGUID: odLQBIjbRpuhP59/RQl29w== X-CSE-MsgGUID: q/6KS7jOTZSiKZABEIeMaQ== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="29782163" X-IronPort-AV: E=Sophos;i="6.14,224,1736841600"; d="scan'208";a="29782163" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 13:58:06 -0800 X-CSE-ConnectionGUID: DnUSyhtPStmb9SoVIl7lKA== X-CSE-MsgGUID: BRvv+jA1RmuTNW/R1SpHOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="118741664" Received: from anguy11-upstream.jf.intel.com ([10.166.9.133]) by orviesa010.jf.intel.com with ESMTP; 05 Mar 2025 13:58:05 -0800 From: Tony Nguyen To: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, andrew+netdev@lunn.ch, netdev@vger.kernel.org Cc: Michal Swiatkowski , anthony.l.nguyen@intel.com, jacob.e.keller@intel.com, tatyana.e.nikolova@intel.com, leon@kernel.org, jgg@ziepe.ca, linux-rdma@vger.kernel.org, Marcin Szycik Subject: [PATCH net-next 2/2] irdma: free iwdev->rf after removing MSI-X Date: Wed, 5 Mar 2025 13:57:53 -0800 Message-ID: <20250305215756.1519390-3-anthony.l.nguyen@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305215756.1519390-1-anthony.l.nguyen@intel.com> References: <20250305215756.1519390-1-anthony.l.nguyen@intel.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org From: Michal Swiatkowski Currently iwdev->rf is allocated in irdma_probe(), but free in irdma_ib_dealloc_device(). It can be misleading. Move the free to irdma_remove() to be more obvious. Freeing in irdma_ib_dealloc_device() leads to KASAN use-after-free issue. Which can also lead to NULL pointer dereference. Fix this. irdma_deinit_interrupts() can't be moved before freeing iwdef->rf, because in this case deinit interrupts will be done before freeing irqs. The simplest solution is to move kfree(iwdev->rf) to irdma_remove(). Reproducer: sudo rmmod irdma Minified splat(s): BUG: KASAN: use-after-free in irdma_remove+0x257/0x2d0 [irdma] Call Trace: ? __pfx__raw_spin_lock_irqsave+0x10/0x10 ? kfree+0x253/0x450 ? irdma_remove+0x257/0x2d0 [irdma] kasan_report+0xed/0x120 ? irdma_remove+0x257/0x2d0 [irdma] irdma_remove+0x257/0x2d0 [irdma] auxiliary_bus_remove+0x56/0x80 device_release_driver_internal+0x371/0x530 ? kernfs_put.part.0+0x147/0x310 driver_detach+0xbf/0x180 bus_remove_driver+0x11b/0x2a0 auxiliary_driver_unregister+0x1a/0x50 irdma_exit_module+0x40/0x4c [irdma] Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] RIP: 0010:ice_free_rdma_qvector+0x2a/0xa0 [ice] Call Trace: ? ice_free_rdma_qvector+0x2a/0xa0 [ice] irdma_remove+0x179/0x2d0 [irdma] auxiliary_bus_remove+0x56/0x80 device_release_driver_internal+0x371/0x530 ? kobject_put+0x61/0x4b0 driver_detach+0xbf/0x180 bus_remove_driver+0x11b/0x2a0 auxiliary_driver_unregister+0x1a/0x50 irdma_exit_module+0x40/0x4c [irdma] Reported-by: Marcin Szycik Closes: https://lore.kernel.org/netdev/8e533834-4564-472f-b29b-4f1cb7730053@linux.intel.com/ Fixes: 3e0d3cb3fbe0 ("ice, irdma: move interrupts code to irdma") Reviewed-by: Marcin Szycik Signed-off-by: Michal Swiatkowski Signed-off-by: Tony Nguyen --- drivers/infiniband/hw/irdma/main.c | 2 ++ drivers/infiniband/hw/irdma/verbs.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/irdma/main.c b/drivers/infiniband/hw/irdma/main.c index 5fc081ca8905..7599e31b5743 100644 --- a/drivers/infiniband/hw/irdma/main.c +++ b/drivers/infiniband/hw/irdma/main.c @@ -255,6 +255,8 @@ static void irdma_remove(struct auxiliary_device *aux_dev) ice_rdma_update_vsi_filter(pf, iwdev->vsi_num, false); irdma_deinit_interrupts(iwdev->rf, pf); + kfree(iwdev->rf); + pr_debug("INIT: Gen2 PF[%d] device remove success\n", PCI_FUNC(pf->pdev->devfn)); } diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c index eeb932e58730..1e8c92826de2 100644 --- a/drivers/infiniband/hw/irdma/verbs.c +++ b/drivers/infiniband/hw/irdma/verbs.c @@ -4871,5 +4871,4 @@ void irdma_ib_dealloc_device(struct ib_device *ibdev) irdma_rt_deinit_hw(iwdev); irdma_ctrl_deinit_hw(iwdev->rf); - kfree(iwdev->rf); }