]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
nfc: Avoid endless loops caused by repeated llcp_sock_connect()
authorXiaoming Ni <nixiaoming@huawei.com>
Thu, 25 Mar 2021 03:51:13 +0000 (11:51 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 7 May 2021 07:53:18 +0000 (09:53 +0200)
commit1f62751ad375969989d6525f8c4e04c5692017a1
tree5f75ddca6fe5418207ddd137a443d37efd515bd6
parentcc9b6d1dd5841d8c56e8f9fecd7e424a9f7c6f6c
nfc: Avoid endless loops caused by repeated llcp_sock_connect()

BugLink: https://bugs.launchpad.net/bugs/1926368
commit 4b5db93e7f2afbdfe3b78e37879a85290187e6f1 upstream.

When sock_wait_state() returns -EINPROGRESS, "sk->sk_state" is
 LLCP_CONNECTING. In this case, llcp_sock_connect() is repeatedly invoked,
 nfc_llcp_sock_link() will add sk to local->connecting_sockets twice.
 sk->sk_node->next will point to itself, that will make an endless loop
 and hang-up the system.
To fix it, check whether sk->sk_state is LLCP_CONNECTING in
 llcp_sock_connect() to avoid repeated invoking.

Fixes: b4011239a08e ("NFC: llcp: Fix non blocking sockets connections")
Reported-by: "kiyin(尹亮)" <kiyin@tencent.com>
Link: https://www.openwall.com/lists/oss-security/2020/11/01/1
Cc: <stable@vger.kernel.org> #v3.11
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
net/nfc/llcp_sock.c