From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (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 A66BA3451BA for ; Fri, 5 Jun 2026 17:04:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780679075; cv=none; b=gvx+kb1/KM2mtezhuKnjI0wyw3TpJ/mw4tR2+PycZBpYVFnL57wYPOkFwDMvnxIMpaL37P/PIx6O7IcBWmUwL7WzYovvIRwjyugTGmVgRZbsw8K9+EC5jcFsWAj6qJpOfLM9s25Yggd1LRHpYJ19rT/475s6qv+Tex9or+vSo0g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780679075; c=relaxed/simple; bh=D/nO13dQ1LzEazrrsrSdTSHRT/e4G5tqDnpjhZe/h5I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l0x5H5KcQEsSYQsNHIOia9wVWcdV9G+RK1EWR0mbLbeqZmvOW+KGoOJlrv+7mqVL5C4nD2JHp6Jfh6qvsm3jMBALvzWNd95P3GfEMV8WbK6iXacNVCQzMIJTdBZOM2jyley7KC/IltHbgznxKky5qKg1r8YMFWXzr2NgHs6oYYI= 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=gSr5j7DV; arc=none smtp.client-ip=209.85.208.182 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="gSr5j7DV" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-3965d76090bso19629451fa.2 for ; Fri, 05 Jun 2026 10:04:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780679072; x=1781283872; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jD9HMBs1n8FhaIiEX38r99JB83FOqKTDd6pKw32kq/Y=; b=gSr5j7DVpMIROAQqBlGzLeicC/1TzuYwZMKxbd+3cM8J/UNPqRDWeb/fR4YDOSVJtB jibPUMY1kwpHi/KHeJH1fdD+NKg5OyMIen9CVYX8cPHcqltP8eBavubFNAFKUM9hR4ic 9iiuSMF8Mpu1//c8yhqf8SActmjy0oeEXmXYjFGH1WZhgBuceY4HvGvIfdd7GVxpfeTy YHDgidohafn6x5JVWG0227kz25FYRe8CcOGhpHgLB1Jf/Apbj0AphacMClbrbYrvPZZ3 sgnJnI2FrM2kl0znnJYpLg7B/AuAFsaPGoLBmOSM0s8/4J17kx/88sCUKkuaU9Uxu+Zz l9Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780679072; x=1781283872; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jD9HMBs1n8FhaIiEX38r99JB83FOqKTDd6pKw32kq/Y=; b=R100TJvT8pA4/zrKD5J0xTeXKBjqEyz3ZJ7fDqg3oDepsaQDnRdvdVjPmYNqfbiRlP OkDFZIc1TW/17hLrTzXvOHjnwWuEZE0dL2A8ABtUIjaIVua/60bw/Ju+JI1HWcpi/Ol8 pPwb0VwJMiRvW1AiF7DNc3dhnrssVd5Jl2j9PSEjT7LVQH8LnZ4GKUMhbtURN6phcSgT jhmexViOIpSZpzKZ1yAiyHXc37Sr+WQbjk2SYqMk4HeE/nGeX2D1qSY7378K0aJHNM4u 3BLBrLoAn3k7z5T9EakUO0+HfD099hgxr6epe1Z9aR+HDut4y7wYijngTy6uLKsrZS9o uZQQ== X-Forwarded-Encrypted: i=1; AFNElJ/CUmW87bdXKjwS6tycH+4iFDtAgXwQkFs70iRhFT5WbPfDF+8dzV090KvMF4Kex7rNCQAf400ckf5RoZs=@vger.kernel.org X-Gm-Message-State: AOJu0YzqvpmkfzLBBGR2gsp6JdeKt6lsVviKgoxK+Aolu9BW03UM8qGi DOpZNlrdP2seOnAiVjEtPeipGk9hPV3iAoph8iqZil3rD8uUqmbGdqG5 X-Gm-Gg: Acq92OFD2o7VIGT34jhr1RmEUN0z40Wz9TQiszHuB3WCwe5/gzp5KaO2MHwBfpvM7B1 CqI09FWWloEoE2GyrCr65mld8cQmofWHK8XbesqYeYwwdgDo+pVHHzQSmEDBVBma8h0onKd6PXc 43qOA235dyeMM10N2VE3myyfiDb/ePUhuBDX28TSCOffQ/YNbN702LwTs8qsY805jsZQ2WyWKOA PFhLqYQCZ1pw78G4ipD6hF7dnTaUfp8PpV891aYWxXOjCp0G7h3mn/inauTML87ha+oULMfYuma hhaZF+cx5ZuaNP2XEs24r7BedDhb/9JC7ixOPyCAmHNPNjYvcPf1hK+7MddlmLQKYpzRQlFUzIj BnamIo6sMqb/GsNDdhBlfVg9GhoKJucMJYQYhu+QuHOjPQm8GQeComeKGupJpvWfY13sYRQRH+p f/W+eVTJhajK5G9U49uuxbfquo50QttMnDkri9UuC/gMA/NuCu9qvp/hBsy5VBhRzz23U/fRrIT K0xVOw= X-Received: by 2002:a2e:bd10:0:b0:396:74ed:a7b1 with SMTP id 38308e7fff4ca-396d08e4001mr13247801fa.15.1780679071635; Fri, 05 Jun 2026 10:04:31 -0700 (PDT) Received: from c0624c666cc5.devsec.astralinux.ru ([93.188.205.42]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-396ac07b66asm26931161fa.11.2026.06.05.10.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 10:04:29 -0700 (PDT) From: Vladislav Nikolaev To: stable@vger.kernel.org, Greg Kroah-Hartman Cc: Vladislav Nikolaev , Zhu Yanjun , Doug Ledford , Jason Gunthorpe , Haggai Eran , Kamal Heib , Amir Vadai , Moni Shoua , Yonatan Cohen , Leon Romanovsky , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Zhu Yanjun , lvc-project@linuxtesting.org, syzbot+cfcc1a3c85be15a40cba@syzkaller.appspotmail.com, Zhu Yanjun Subject: [PATCH 6.1 2/3] RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task" Date: Fri, 5 Jun 2026 20:03:28 +0300 Message-ID: <20260605170349.1524-3-vlad102nikolaev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260605170349.1524-1-vlad102nikolaev@gmail.com> References: <20260605170349.1524-1-vlad102nikolaev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zhu Yanjun commit b2b1ddc457458fecd1c6f385baa9fbda5f0c63ad upstream. In the function rxe_create_qp(), rxe_qp_from_init() is called to initialize qp, internally things like rxe_init_task are not setup until rxe_qp_init_req(). If an error occurred before this point then the unwind will call rxe_cleanup() and eventually to rxe_qp_do_cleanup()/rxe_cleanup_task() which will oops when trying to access the uninitialized spinlock. If rxe_init_task is not executed, rxe_cleanup_task will not be called. Reported-by: syzbot+cfcc1a3c85be15a40cba@syzkaller.appspotmail.com Link: https://syzkaller.appspot.com/bug?id=fd85757b74b3eb59f904138486f755f71e090df8 Fixes: 8700e3e7c485 ("Soft RoCE driver") Fixes: 2d4b21e0a291 ("IB/rxe: Prevent from completer to operate on non valid QP") Signed-off-by: Zhu Yanjun Link: https://lore.kernel.org/r/20230413101115.1366068-1-yanjun.zhu@intel.com Signed-off-by: Leon Romanovsky [ Vladislav: match upstream cleanup order and add the missing resp.task.func check. ] Signed-off-by: Vladislav Nikolaev --- drivers/infiniband/sw/rxe/rxe_qp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 05e4a270084f..171c0f4dcbec 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -781,15 +781,20 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->valid = 0; qp->qp_timeout_jiffies = 0; - rxe_cleanup_task(&qp->resp.task); if (qp_type(qp) == IB_QPT_RC) { del_timer_sync(&qp->retrans_timer); del_timer_sync(&qp->rnr_nak_timer); } - rxe_cleanup_task(&qp->req.task); - rxe_cleanup_task(&qp->comp.task); + if (qp->resp.task.func) + rxe_cleanup_task(&qp->resp.task); + + if (qp->req.task.func) + rxe_cleanup_task(&qp->req.task); + + if (qp->comp.task.func) + rxe_cleanup_task(&qp->comp.task); /* flush out any receive wr's or pending requests */ if (qp->req.task.func) -- 2.43.0