OSDN Git Service

chtls: Fix panic when route to peer not configured
authorAyush Sawal <ayush.sawal@chelsio.com>
Wed, 6 Jan 2021 04:29:08 +0000 (09:59 +0530)
committerJakub Kicinski <kuba@kernel.org>
Fri, 8 Jan 2021 01:06:02 +0000 (17:06 -0800)
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: cc35c88ae4db ("crypto : chtls - CPL handler definition")
Signed-off-by: Rohit Maheshwari <rohitm@chelsio.com>
Signed-off-by: Ayush Sawal <ayush.sawal@chelsio.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c

index 431d1e3..04a8bd5 100644 (file)
@@ -1109,6 +1109,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 neighbour *n = NULL;
        struct inet_sock *newinet;
        const struct iphdr *iph;
@@ -1118,9 +1119,10 @@ static struct sock *chtls_recv_sock(struct sock *lsk,
        struct dst_entry *dst;
        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);
@@ -1152,7 +1154,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk,
                n = dst_neigh_lookup(dst, &ip6h->saddr);
 #endif
        }
-       if (!n)
+       if (!n || !n->dev)
                goto free_sk;
 
        ndev = n->dev;
@@ -1161,6 +1163,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);
@@ -1238,6 +1247,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);