]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
chtls: Fix potential resource leak
authorPan Bian <bianpan2016@163.com>
Thu, 21 Jan 2021 14:57:38 +0000 (06:57 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Feb 2021 12:51:14 +0000 (13:51 +0100)
[ Upstream commit b6011966ac6f402847eb5326beee8da3a80405c7 ]

The dst entry should be released if no neighbour is found. Goto label
free_dst to fix the issue. Besides, the check of ndev against NULL is
redundant.

Signed-off-by: Pan Bian <bianpan2016@163.com>
Link: https://lore.kernel.org/r/20210121145738.51091-1-bianpan2016@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/crypto/chelsio/chtls/chtls_cm.c

index fd3092a4378e49fb26d2deeeb949492e08846ef8..08ed3ff8b255fab4edf578af941a997d70aa6d26 100644 (file)
@@ -1051,11 +1051,9 @@ static struct sock *chtls_recv_sock(struct sock *lsk,
        tcph = (struct tcphdr *)(iph + 1);
        n = dst_neigh_lookup(dst, &iph->saddr);
        if (!n || !n->dev)
-               goto free_sk;
+               goto free_dst;
 
        ndev = n->dev;
-       if (!ndev)
-               goto free_dst;
        if (is_vlan_dev(ndev))
                ndev = vlan_dev_real_dev(ndev);
 
@@ -1117,7 +1115,8 @@ static struct sock *chtls_recv_sock(struct sock *lsk,
 free_csk:
        chtls_sock_release(&csk->kref);
 free_dst:
-       neigh_release(n);
+       if (n)
+               neigh_release(n);
        dst_release(dst);
 free_sk:
        inet_csk_prepare_forced_close(newsk);