From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8F52C76196 for ; Sat, 1 Apr 2023 02:46:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233215AbjDACqk (ORCPT ); Fri, 31 Mar 2023 22:46:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231775AbjDACqj (ORCPT ); Fri, 31 Mar 2023 22:46:39 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CDFC11E89 for ; Fri, 31 Mar 2023 19:46:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680317198; x=1711853198; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pB0gu9UEjWWLKXECU6kmj+89BPM5laYcaVBzTTAWpAE=; b=QFtZWJSSJvSDwxeyVPIwLaL6AlwltK/qT5MEx3/NPaJe1m/Y5TIz7GaV IvFpFcZ+gsH3jhNH4wRyQLsVeREkNnEMasZioPYCJbUiQcC5p2O9l4vJs 06gIebfxaoGFXi0c7FwtKyb5x/jll/MicHRxXO78kQukMkUEh1I2FxTRk osRKey2HlINje/FUXrz3YVIjcAiFMzBcJJ7d8K8M8kzwC9F0tAv0F32n+ 16lwYa4G2OWIyc7SLc/7rQM/TcGIspGJVJB+mFeP8l5UvdqBEzxPI/feL gh1DNyaTGrtmvPpCcmdIqDugRvdIuqZbRHeaq1NdQpdlT4Pbcnva8tKPh g==; X-IronPort-AV: E=McAfee;i="6600,9927,10666"; a="340327793" X-IronPort-AV: E=Sophos;i="5.98,308,1673942400"; d="scan'208";a="340327793" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2023 19:46:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10666"; a="678826592" X-IronPort-AV: E=Sophos;i="5.98,308,1673942400"; d="scan'208";a="678826592" Received: from unknown (HELO intel-71.bj.intel.com) ([10.238.154.71]) by orsmga007.jf.intel.com with ESMTP; 31 Mar 2023 19:46:36 -0700 From: Zhu Yanjun To: zyjzyj2000@gmail.com, jgg@ziepe.ca, leon@kernel.org, linux-rdma@vger.kernel.org Cc: Zhu Yanjun , syzbot+cfcc1a3c85be15a40cba@syzkaller.appspotmail.com Subject: [PATCH 1/1] RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task" Date: Sat, 1 Apr 2023 10:44:17 +0800 Message-Id: <20230401024417.3334889-1-yanjun.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <095b1562-0c5e-4390-adf3-59ec0ed3e97e@linux.dev> References: <095b1562-0c5e-4390-adf3-59ec0ed3e97e@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Zhu Yanjun 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 occures 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 --- drivers/infiniband/sw/rxe/rxe_qp.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index ab72db68b58f..7856c02c1b46 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -176,6 +176,10 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp, spin_lock_init(&qp->rq.producer_lock); spin_lock_init(&qp->rq.consumer_lock); + memset(&qp->req.task, 0, sizeof(struct rxe_task)); + memset(&qp->comp.task, 0, sizeof(struct rxe_task)); + memset(&qp->resp.task, 0, sizeof(struct rxe_task)); + atomic_set(&qp->ssn, 0); atomic_set(&qp->skb_out, 0); } @@ -773,15 +777,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->resp.task.func) + 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->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.27.0