From patchwork Mon Apr 14 23:42:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatyana Nikolova X-Patchwork-Id: 14051238 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 B61B319DFB4 for ; Mon, 14 Apr 2025 23:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744674235; cv=none; b=UFvtpOAN1xdyB/ZBOMZ2Hxd+PVw5KLJZzUtVi4Ks2kdWfh2xQi7nvanJAtV0/0oI4TqYVC+vCzr6x2ModhjPx2lUjtm7ldq3uW2ThulJwaIfNAsL64aHSbdFZF2rjqNO0zdCv1s9KntZ1aSf9RGrlO3ZDtYbc2ADVlAo+5NMX1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744674235; c=relaxed/simple; bh=uocl/OfR2NB/Ht+CCTK9+GlJGOXT72YGx9u9MNQxkkg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=sOztIOftKvFV5eTVoWr3FPvbgPe4pAL2eXgsXjMIKLE5a9ARtWo2UNeL9OEgYFiNYFCPCZyOZjeAsALAYQpMnrfZnXgaOGDGsK02KNGb6fu2Kqshl7XNY4VunZH4edHXXI+619Tt2Hka44oSSM1PLF97qn+COpQNiTOJpQkJJ/c= 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=SXy6Mm0N; arc=none smtp.client-ip=198.175.65.21 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="SXy6Mm0N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744674233; x=1776210233; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=uocl/OfR2NB/Ht+CCTK9+GlJGOXT72YGx9u9MNQxkkg=; b=SXy6Mm0N8StpGFq0w7diMt+MuOCqx7BaWblWTlLWClO3IHvpgGNBx+lG BfL7ovxHWrb6S+j8zgFu9cDWiJfmEBHrr4eZBs2y6hJmCc6uEAfyUqDmn A6Z3MNjcfg5rl/o2IMF9nCg1EwgzHaxjDCfdFcWpaAFH6nKEm2KnGcZpf OpguuoHctuRWh/nMODQFqAlyP1H5C/SW+iwXKagr6LgQlQNKpNl0juYYz yZ0XZr5K8v5L16SfxCF/of2wqr2Gm76SrOka3CGe2tEnGDLFcYuzSBgQ5 pyUabEEFGooLeiS2MVCFbbRylOD+qrDLT19SOTqMFsdY/B1tcVYtao0J7 Q==; X-CSE-ConnectionGUID: hKi9g0YkTxuj6Oyqjeodig== X-CSE-MsgGUID: KRzqNy6gRQmdR/j40A7mkg== X-IronPort-AV: E=McAfee;i="6700,10204,11403"; a="46074088" X-IronPort-AV: E=Sophos;i="6.15,213,1739865600"; d="scan'208";a="46074088" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2025 16:43:53 -0700 X-CSE-ConnectionGUID: gYzfTTAaRX20NxsX3RadqA== X-CSE-MsgGUID: 1sBQU1kWS1Sh3KYyDa8VWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,213,1739865600"; d="scan'208";a="153135580" Received: from bnkannan-mobl1.amr.corp.intel.com (HELO soc-PF51RAGT.clients.intel.com) ([10.246.114.218]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2025 16:43:52 -0700 From: Tatyana Nikolova To: jgg@nvidia.com, leon@kernel.org Cc: linux-rdma@vger.kernel.org, Michal Swiatkowski , Marcin Szycik , Tatyana Nikolova Subject: [PATCH for-rc 1/2] irdma: free iwdev->rf after removing MSI-X Date: Mon, 14 Apr 2025 18:42:30 -0500 Message-ID: <20250414234231.523-1-tatyana.e.nikolova@intel.com> X-Mailer: git-send-email 2.45.1 Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: Tatyana Nikolova --- 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 1ee8969595d3..d10fd16dcec3 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); } From patchwork Mon Apr 14 23:42:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tatyana Nikolova X-Patchwork-Id: 14051239 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (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 B78911F5616 for ; Mon, 14 Apr 2025 23:43:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744674237; cv=none; b=kGxW2QxB/0+lkX+usk14DtQrgGXRoV7+eqrtxF4W+W0qgsykuQY1/pmanRU5GQwnmYa2G8BD5/iZgaHynJqmNet7zVy3TrGG71JlCBpqDpy+odsknLX3reSJRjyAz6CE8eE/OOZKXFYSk3t5i2oYCHM77M2i1GZhxehAbCeIC2Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744674237; c=relaxed/simple; bh=RmpGJtKq2jCQjyf920xVrCoprltAsMHmH0FotKyACzI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iCfJhpzOxmbAupZF2JOi5uYqzV/gfDF7ixPe5XuyRyLuluePpZSFixNI1lrr/JNnZgbuMWkD+PrLxl9Wwh2syZlgP0FMO4YIBwgpFI+tqEKbvyPudOmjR0+/w5/RQlrUT+KBraSofIezwmjL4kEzp8Iw3IOYjzLavBx8eqR9y7g= 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=mD46xeOc; arc=none smtp.client-ip=198.175.65.21 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="mD46xeOc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744674235; x=1776210235; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RmpGJtKq2jCQjyf920xVrCoprltAsMHmH0FotKyACzI=; b=mD46xeOcQbM26lU/BWg6Cuk00HZg5FoSajWl8MrZsGW/fOBMdV0GRlm8 6pP8/HcsHtYqsJdiRgghGSkIYFjULQk0H77VRHd3dUtlEHxT9NHT7Lek+ 0tq6AJDatplhiytvsI8jY1/0C2I6zxzEjT1TkllZ7vC7UMIEDS3YszacJ ETYA2OQ/EKiwFdPAu0ZJZbiK6ybzzcsCmF4n3ytuKE243KkJzTRCW30JT lZ694UYt2OWgGaW/yCTGoKaUwIlKtfwoz+vV7c/6M/K0IIDDjo98uTuTl bYG4N6TOsFgR7r6MQvgWMyhyoGSVCmNWAZuNNdy3/1wbJDD/MIHx5gNMb Q==; X-CSE-ConnectionGUID: jTdqrKklTD6o5ud/p/4dGg== X-CSE-MsgGUID: QgFvw6O0R3Os2FskPo40Lw== X-IronPort-AV: E=McAfee;i="6700,10204,11403"; a="46074091" X-IronPort-AV: E=Sophos;i="6.15,213,1739865600"; d="scan'208";a="46074091" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2025 16:43:53 -0700 X-CSE-ConnectionGUID: b5HqgqpTSLCdC5b+oZfyvg== X-CSE-MsgGUID: h9ZXBrMdSIePP6MSP/lVWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,213,1739865600"; d="scan'208";a="153135583" Received: from bnkannan-mobl1.amr.corp.intel.com (HELO soc-PF51RAGT.clients.intel.com) ([10.246.114.218]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2025 16:43:52 -0700 From: Tatyana Nikolova To: jgg@nvidia.com, leon@kernel.org Cc: linux-rdma@vger.kernel.org, Dan Carpenter , Tatyana Nikolova Subject: [PATCH for-rc 2/2] ice, irdma: fix an off by one in error handling code Date: Mon, 14 Apr 2025 18:42:31 -0500 Message-ID: <20250414234231.523-2-tatyana.e.nikolova@intel.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20250414234231.523-1-tatyana.e.nikolova@intel.com> References: <20250414234231.523-1-tatyana.e.nikolova@intel.com> Precedence: bulk X-Mailing-List: linux-rdma@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Signed-off-by: Tatyana Nikolova --- 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 d10fd16dcec3..7599e31b5743 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);