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

Commit 301a4264 authored by Xiaoming Ni's avatar Xiaoming Ni Committed by Greg Kroah-Hartman
Browse files

nfc: fix memory leak in llcp_sock_connect() 



commit 7574fcdbdcb335763b6b322f6928dc0fd5730451 upstream.

In llcp_sock_connect(), use kmemdup to allocate memory for
 "llcp_sock->service_name". The memory is not released in the sock_unlink
label of the subsequent failure branch.
As a result, memory leakage occurs.

fix CVE-2020-25672

Fixes: d646960f ("NFC: Initial LLCP support")
Reported-by: default avatar"kiyin(尹亮)" <kiyin@tencent.com>
Link: https://www.openwall.com/lists/oss-security/2020/11/01/1


Cc: <stable@vger.kernel.org> #v3.3
Signed-off-by: default avatarXiaoming Ni <nixiaoming@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c14b5018

net/nfc/llcp_sock.c

+2 −0
Original line number Diff line number Diff line
@@ -757,6 +757,8 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, 
	nfc_llcp_local_put(llcp_sock->local);



	nfc_llcp_sock_unlink(&local->connecting_sockets, sk);

	kfree(llcp_sock->service_name);

	llcp_sock->service_name = NULL;



put_dev:

	nfc_put_device(dev);