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

Commit 6259963d authored by Pan Bian's avatar Pan Bian Committed by Greg Kroah-Hartman
Browse files

chtls: Fix potential resource leak



[ 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: default avatarPan Bian <bianpan2016@163.com>
Link: https://lore.kernel.org/r/20210121145738.51091-1-bianpan2016@163.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1d915c56
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -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,6 +1115,7 @@ static struct sock *chtls_recv_sock(struct sock *lsk,
free_csk:
	chtls_sock_release(&csk->kref);
free_dst:
	if (n)
		neigh_release(n);
	dst_release(dst);
free_sk: