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

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

nfc: fix refcount leak in llcp_sock_bind() 



commit c33b1cc62ac05c1dbb1cdafe2eb66da01c76ca8d upstream.

nfc_llcp_local_get() is invoked in llcp_sock_bind(),
but nfc_llcp_local_put() is not invoked in subsequent failure branches.
As a result, refcount leakage occurs.
To fix it, add calling nfc_llcp_local_put().

fix CVE-2020-25670
Fixes: c7aa1225 ("NFC: Take a reference on the LLCP local pointer when creating a socket")
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.6
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 5f59ece3

net/nfc/llcp_sock.c

+2 −0
Original line number Diff line number Diff line
@@ -119,11 +119,13 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) 
					  llcp_sock->service_name_len,

					  GFP_KERNEL);

	if (!llcp_sock->service_name) {

		nfc_llcp_local_put(llcp_sock->local);

		ret = -ENOMEM;

		goto put_dev;

	}

	llcp_sock->ssap = nfc_llcp_get_sdp_ssap(local, llcp_sock);

	if (llcp_sock->ssap == LLCP_SAP_MAX) {

		nfc_llcp_local_put(llcp_sock->local);

		kfree(llcp_sock->service_name);

		llcp_sock->service_name = NULL;

		ret = -EADDRINUSE;