From patchwork Mon Oct 24 11:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8937 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp435059wru; Mon, 24 Oct 2022 05:53:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7nnXkCFFa1x8y70EXhifQHIQYT6XilNyNoQ/V/9IsIqt+hNKT84zrdj/TJROjr28R9PMKH X-Received: by 2002:a17:907:744:b0:741:36b9:d2cc with SMTP id xc4-20020a170907074400b0074136b9d2ccmr26461113ejb.613.1666616015012; Mon, 24 Oct 2022 05:53:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666616015; cv=none; d=google.com; s=arc-20160816; b=UGMHUopnpa4WTQ5792DPgmNjj2M44wuOvxr7gXjGcq3shxdR6yszdfZrCkVZrnnRzZ rBy1MlQrf99ydLN63v87P7SgEbrjYqj34JJd8BDwFoNHoao1y+r+E535wSc4HZ9RErCu 0PlGxYx9tECQCA+ZCS8BlnzCrzUAZ8kSKLxVP+b1/YgEawSFc1XrId5wFOaDVQIckFNA tRQrz4Gx0w9FUA7kJkiNzjivxrBurNchPQ3N/LgNf10AF6QDY574AFgK6WyhEo12h8I+ 7BJRpSEzazrKzxhwV8tzeQSYzliyHIGj7mnF2QBwKLZ3qkQ9/3m8PZHdFkK1PdrSH/UF m0lA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yelop9q74YkPOZ4gsG10ihT5SLmc7sj/3WDxiorRvkM=; b=Ubb3BEbAih6O5Uy6d6DY1d13Ec4g87G27uzcv7Q8IsuapgBpDoicD6ybnvKEWZj86z 2haeJGYF9NR1pkv/7VqVOhZsMnUo5TDHTdF8V5qGQ9uGVL9PdtaIwNLi5H6iibXH5BHj cQ3NlXE0x5OvTtFq1XuDA8xoI7WqcSb92o+oN8h0uCW1g+lTjtp4S5aTHM1Wg/r+77Wk NGhV6GoqR/5hTUCsdqRd7uCxW7rxsTsdMXr4IMyipTsk0aZUPefm980Tty1cWaFkl8PM MeuRN/A9nH7cAeIJH8q6JsGRZhilLq01zuTHlOnBNfDn8M8hgBGX88fOqZzbhLLb6r1g xHPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PCabu5h9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j7-20020a05640211c700b004593a09f7cdsi26857095edw.394.2022.10.24.05.53.10; Mon, 24 Oct 2022 05:53:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PCabu5h9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234634AbiJXMwQ (ORCPT + 99 others); Mon, 24 Oct 2022 08:52:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234882AbiJXMqB (ORCPT ); Mon, 24 Oct 2022 08:46:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F4E57FF8F; Mon, 24 Oct 2022 05:10:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2CF72612BB; Mon, 24 Oct 2022 12:10:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F3F3C433D6; Mon, 24 Oct 2022 12:10:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613429; bh=Z4KwhnZocj034/nVJJU8n25lrzvP5QKqGXheAD/kt6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PCabu5h9goUcc7oMfupjCR1uYKWNneEmEo1wAgsnSWWjz7HgLNvNfYNO/aQ7OyXFD FRNzIcF8OTW7rI2iWTOAcAI4isMzOst3iN9IGC5l/8qDwcK/3sMa9DDj6ykMc5mKhi d/fW1Jg+gNo0toAMO0yzZKnnLLxPab1IVTjjUFB4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+ab99dc4c6e961eed8b8e@syzkaller.appspotmail.com, Zhu Yanjun , Li Zhijian , Bob Pearson , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.4 134/255] RDMA/rxe: Fix "kernel NULL pointer dereference" error Date: Mon, 24 Oct 2022 13:30:44 +0200 Message-Id: <20221024113007.032306033@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747573554415452055?= X-GMAIL-MSGID: =?utf-8?q?1747573554415452055?= From: Zhu Yanjun [ Upstream commit a625ca30eff806395175ebad3ac1399014bdb280 ] When rxe_queue_init in the function rxe_qp_init_req fails, both qp->req.task.func and qp->req.task.arg are not initialized. Because of creation of qp fails, the function rxe_create_qp will call rxe_qp_do_cleanup to handle allocated resource. Before calling __rxe_do_task, both qp->req.task.func and qp->req.task.arg should be checked. Fixes: 8700e3e7c485 ("Soft RoCE driver") Link: https://lore.kernel.org/r/20220822011615.805603-2-yanjun.zhu@linux.dev Reported-by: syzbot+ab99dc4c6e961eed8b8e@syzkaller.appspotmail.com Signed-off-by: Zhu Yanjun Reviewed-by: Li Zhijian Reviewed-by: Bob Pearson Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/sw/rxe/rxe_qp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 57f111fe5443..be3eff792864 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -805,7 +805,9 @@ void rxe_qp_destroy(struct rxe_qp *qp) rxe_cleanup_task(&qp->comp.task); /* flush out any receive wr's or pending requests */ - __rxe_do_task(&qp->req.task); + if (qp->req.task.func) + __rxe_do_task(&qp->req.task); + if (qp->sq.queue) { __rxe_do_task(&qp->comp.task); __rxe_do_task(&qp->req.task);