From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3E2EC1EABA8; Tue, 15 Oct 2024 12:08:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728994099; cv=none; b=XRtfvsZp8m+cqx02eNPhkZvjkr2QFCD2T+Z1er2iynQq31gMXAN6PbmioGWIZBvkbBAG0Ztk8hYHk61dpfkoEGdFxWEErxdUHDeHJPTbZNd7BZtJIJkuau4VzGktQEtKo4lJrqH0f1SDi2h2+RhQ/nyBNrYH+2xV/Xi3ONXKvZg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728994099; c=relaxed/simple; bh=rUVJXurEhfPzuVfddOLmjoHLFhtazpbjoS5hP5/IAG0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XEqykoy8WTZlDt7iuv/ym3QR6Tiu1SNnv9MLZJ7HAI/hd4Z7Xl0YLXzqfZQ1ufaiV3ZQ37mNcxI8ynsRJwuokyKqpxDf31QM7bqPNFyj/Nfw4OGfdtkzzl1b6tBjkc+3UYTMSzvcNXSwj7Co4Mdqa7sRTCDQVyQ2+OCnIuDOBsg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dk40b8zM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dk40b8zM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2609C4CECE; Tue, 15 Oct 2024 12:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728994099; bh=rUVJXurEhfPzuVfddOLmjoHLFhtazpbjoS5hP5/IAG0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dk40b8zMQs4NLfq34COvV0/Icwjx1sv+EP02gj9XXA+eeM4Q30WtuB+JXf8V+E9EL UdO0lc4/2V/kvS3Qa8v2+k6O7OE36i9HnJakupYY6LdjgximypC+eP6IkDiaGyf7A3 1utIO5wdnFz8/lXqkI86Gt/cR+JLxyYPKraiHXy8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Md Haris Iqbal , Jack Wang , Grzegorz Prajsner , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.15 606/691] RDMA/rtrs-srv: Avoid null pointer deref during path establishment Date: Tue, 15 Oct 2024 13:29:14 +0200 Message-ID: <20241015112504.392647080@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015112440.309539031@linuxfoundation.org> References: <20241015112440.309539031@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Md Haris Iqbal [ Upstream commit d0e62bf7b575fbfe591f6f570e7595dd60a2f5eb ] For RTRS path establishment, RTRS client initiates and completes con_num of connections. After establishing all its connections, the information is exchanged between the client and server through the info_req message. During this exchange, it is essential that all connections have been established, and the state of the RTRS srv path is CONNECTED. So add these sanity checks, to make sure we detect and abort process in error scenarios to avoid null pointer deref. Signed-off-by: Md Haris Iqbal Signed-off-by: Jack Wang Signed-off-by: Grzegorz Prajsner Link: https://patch.msgid.link/20240821112217.41827-9-haris.iqbal@ionos.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c index 1af6db9a6511a..4fa916a8f3865 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c @@ -943,12 +943,11 @@ static void rtrs_srv_info_req_done(struct ib_cq *cq, struct ib_wc *wc) if (err) goto close; -out: rtrs_iu_free(iu, srv_path->s.dev->ib_dev, 1); return; close: + rtrs_iu_free(iu, srv_path->s.dev->ib_dev, 1); close_path(srv_path); - goto out; } static int post_recv_info_req(struct rtrs_srv_con *con) @@ -999,6 +998,16 @@ static int post_recv_path(struct rtrs_srv_path *srv_path) q_size = SERVICE_CON_QUEUE_DEPTH; else q_size = srv->queue_depth; + if (srv_path->state != RTRS_SRV_CONNECTING) { + rtrs_err(s, "Path state invalid. state %s\n", + rtrs_srv_state_str(srv_path->state)); + return -EIO; + } + + if (!srv_path->s.con[cid]) { + rtrs_err(s, "Conn not set for %d\n", cid); + return -EIO; + } err = post_recv_io(to_srv_con(srv_path->s.con[cid]), q_size); if (err) { -- 2.43.0