Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dcce456b authored by Ayush Sawal's avatar Ayush Sawal Committed by Greg Kroah-Hartman
Browse files

chtls: Fix panic when route to peer not configured 



[ Upstream commit 5a5fac9966bb6d513198634b0b1357be7e8447d2 ]

If route to peer is not configured, we might get non tls
devices from dst_neigh_lookup() which is invalid, adding a
check to avoid it.

Fixes: cc35c88a ("crypto : chtls - CPL handler definition")
Signed-off-by: default avatarRohit Maheshwari <rohitm@chelsio.com>
Signed-off-by: default avatarAyush Sawal <ayush.sawal@chelsio.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 44bed66b

drivers/crypto/chelsio/chtls/chtls_cm.c

+12 −2
Original line number Diff line number Diff line
@@ -1021,6 +1021,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
				    const struct cpl_pass_accept_req *req,

				    struct chtls_dev *cdev)

{

	struct adapter *adap = pci_get_drvdata(cdev->pdev);

	struct inet_sock *newinet;

	const struct iphdr *iph;

	struct tls_context *ctx;
@@ -1030,9 +1031,10 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
	struct neighbour *n;

	struct tcp_sock *tp;

	struct sock *newsk;

	bool found = false;

	u16 port_id;

	int rxq_idx;

	int step;

	int step, i;



	iph = (const struct iphdr *)network_hdr;

	newsk = tcp_create_openreq_child(lsk, oreq, cdev->askb);
@@ -1044,7 +1046,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
		goto free_sk;



	n = dst_neigh_lookup(dst, &iph->saddr);

	if (!n)

	if (!n || !n->dev)

		goto free_sk;



	ndev = n->dev;
@@ -1053,6 +1055,13 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
	if (is_vlan_dev(ndev))

		ndev = vlan_dev_real_dev(ndev);



	for_each_port(adap, i)

		if (cdev->ports[i] == ndev)

			found = true;



	if (!found)

		goto free_dst;



	port_id = cxgb4_port_idx(ndev);



	csk = chtls_sock_create(cdev);
@@ -1108,6 +1117,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk, 
free_csk:

	chtls_sock_release(&csk->kref);

free_dst:

	neigh_release(n);

	dst_release(dst);

free_sk:

	inet_csk_prepare_forced_close(newsk);