]> git.baikalelectronics.ru Git - 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)
committerDavid S. Miller <davem@davemloft.net>
Fri, 26 Mar 2021 00:02:01 +0000 (17:02 -0700)
commitfd356e9efb85656008665ecdca44052f8c187a7c
tree2be8fea7f9a3038986c1d018655b23abf4e9a225
parent1393695f22bb1415725112a2bdf1607dd3e6b1c6
nfc: Avoid endless loops caused by repeated llcp_sock_connect()

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: 77d45bfd252d ("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>
net/nfc/llcp_sock.c