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 27E9562148; Mon, 8 Apr 2024 13:19:12 +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=1712582352; cv=none; b=p8Rj2bOS0d7ny1t7sf8QcsVdwqAR/p0eG1AxrNlDWVBX0DiN535yOU/OsPKxmR3tWBtH+TQatb8pzoeJirxQcq0Bvc7AztTHZX4EdrBL1jWiDzsUx4btCYv6CP1NUENKFH/ne6D36t5CkgULxAYXvk7WxKxUPLTSO4hj0aeZUR4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712582352; c=relaxed/simple; bh=KjPSBnoTuxBT6iMVdvOeNLiRMavrTHxZ/Oj8sZX5z1k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PuN19YnmQmFoVNx3w6CKgb044rLV8bhTQpIF2d/wRiASzmCMwT7HSAi1VXsVGgY3yrk48JkbfRMH+LKXHVf1M7hMbgqmI+sYa/N3INDEQqVykyRFT0QpVhZuY64F3tv5wqKFnOoOTueLt+lmjSUi+hRhUceqiO8E7JPlUtvHeSw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Gv1xpQid; 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="Gv1xpQid" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F142C433F1; Mon, 8 Apr 2024 13:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712582352; bh=KjPSBnoTuxBT6iMVdvOeNLiRMavrTHxZ/Oj8sZX5z1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gv1xpQid2WNBsAwAONTCsvbfvYc02JAYG11/T9/3um1VgHAAIEj3uKlMHILauWty5 KyhRALSDsFYGFAgc4IJiZWYcCCPC8BOybK0mdBI141nN7rh8cpyZBbHC+OvomKwvLt HVYPA/Qwnu4jIzfivpbJKjReJhRILj9J/5ihNO+E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mahmoud Adam , Simon Horman , Jakub Kicinski Subject: [PATCH 6.6 086/252] net/rds: fix possible cp null dereference Date: Mon, 8 Apr 2024 14:56:25 +0200 Message-ID: <20240408125309.313637542@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408125306.643546457@linuxfoundation.org> References: <20240408125306.643546457@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 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mahmoud Adam commit 62fc3357e079a07a22465b9b6ef71bb6ea75ee4b upstream. cp might be null, calling cp->cp_conn would produce null dereference [Simon Horman adds:] Analysis: * cp is a parameter of __rds_rdma_map and is not reassigned. * The following call-sites pass a NULL cp argument to __rds_rdma_map() - rds_get_mr() - rds_get_mr_for_dest * Prior to the code above, the following assumes that cp may be NULL (which is indicative, but could itself be unnecessary) trans_private = rs->rs_transport->get_mr( sg, nents, rs, &mr->r_key, cp ? cp->cp_conn : NULL, args->vec.addr, args->vec.bytes, need_odp ? ODP_ZEROBASED : ODP_NOT_NEEDED); * The code modified by this patch is guarded by IS_ERR(trans_private), where trans_private is assigned as per the previous point in this analysis. The only implementation of get_mr that I could locate is rds_ib_get_mr() which can return an ERR_PTR if the conn (4th) argument is NULL. * ret is set to PTR_ERR(trans_private). rds_ib_get_mr can return ERR_PTR(-ENODEV) if the conn (4th) argument is NULL. Thus ret may be -ENODEV in which case the code in question will execute. Conclusion: * cp may be NULL at the point where this patch adds a check; this patch does seem to address a possible bug Fixes: c055fc00c07b ("net/rds: fix WARNING in rds_conn_connect_if_down") Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Mahmoud Adam Reviewed-by: Simon Horman Link: https://lore.kernel.org/r/20240326153132.55580-1-mngyadam@amazon.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/rds/rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -302,7 +302,7 @@ static int __rds_rdma_map(struct rds_soc } ret = PTR_ERR(trans_private); /* Trigger connection so that its ready for the next retry */ - if (ret == -ENODEV) + if (ret == -ENODEV && cp) rds_conn_connect_if_down(cp->cp_conn); goto out; }