|
Takashi Iwai |
ee06cf |
From 4b5db93e7f2afbdfe3b78e37879a85290187e6f1 Mon Sep 17 00:00:00 2001
|
|
Takashi Iwai |
ee06cf |
From: Xiaoming Ni <nixiaoming@huawei.com>
|
|
Takashi Iwai |
ee06cf |
Date: Thu, 25 Mar 2021 11:51:13 +0800
|
|
Takashi Iwai |
ee06cf |
Subject: [PATCH] nfc: Avoid endless loops caused by repeated llcp_sock_connect()
|
|
Takashi Iwai |
ee06cf |
Mime-version: 1.0
|
|
Takashi Iwai |
ee06cf |
Content-type: text/plain; charset=UTF-8
|
|
Takashi Iwai |
ee06cf |
Content-transfer-encoding: 8bit
|
|
Takashi Iwai |
ee06cf |
Git-commit: 4b5db93e7f2afbdfe3b78e37879a85290187e6f1
|
|
Takashi Iwai |
ee06cf |
Patch-mainline: v5.12-rc7
|
|
Takashi Iwai |
ee06cf |
References: CVE-2020-25673 bsc#1178181
|
|
Takashi Iwai |
ee06cf |
|
|
Takashi Iwai |
ee06cf |
When sock_wait_state() returns -EINPROGRESS, "sk->sk_state" is
|
|
Takashi Iwai |
ee06cf |
LLCP_CONNECTING. In this case, llcp_sock_connect() is repeatedly invoked,
|
|
Takashi Iwai |
ee06cf |
nfc_llcp_sock_link() will add sk to local->connecting_sockets twice.
|
|
Takashi Iwai |
ee06cf |
sk->sk_node->next will point to itself, that will make an endless loop
|
|
Takashi Iwai |
ee06cf |
and hang-up the system.
|
|
Takashi Iwai |
ee06cf |
To fix it, check whether sk->sk_state is LLCP_CONNECTING in
|
|
Takashi Iwai |
ee06cf |
llcp_sock_connect() to avoid repeated invoking.
|
|
Takashi Iwai |
ee06cf |
|
|
Takashi Iwai |
ee06cf |
Fixes: b4011239a08e ("NFC: llcp: Fix non blocking sockets connections")
|
|
Takashi Iwai |
ee06cf |
Reported-by: "kiyin(尹亮)" <kiyin@tencent.com>
|
|
Takashi Iwai |
ee06cf |
Link: https://www.openwall.com/lists/oss-security/2020/11/01/1
|
|
Takashi Iwai |
ee06cf |
Cc: <stable@vger.kernel.org> #v3.11
|
|
Takashi Iwai |
ee06cf |
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
|
|
Takashi Iwai |
ee06cf |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Takashi Iwai |
ee06cf |
Acked-by: Takashi Iwai <tiwai@suse.de>
|
|
Takashi Iwai |
ee06cf |
|
|
Takashi Iwai |
ee06cf |
---
|
|
Takashi Iwai |
ee06cf |
net/nfc/llcp_sock.c | 4 ++++
|
|
Takashi Iwai |
ee06cf |
1 file changed, 4 insertions(+)
|
|
Takashi Iwai |
ee06cf |
|
|
Takashi Iwai |
ee06cf |
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
|
|
Takashi Iwai |
ee06cf |
index 59172614b249..a3b46f888803 100644
|
|
Takashi Iwai |
ee06cf |
--- a/net/nfc/llcp_sock.c
|
|
Takashi Iwai |
ee06cf |
+++ b/net/nfc/llcp_sock.c
|
|
Takashi Iwai |
ee06cf |
@@ -673,6 +673,10 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
|
|
Takashi Iwai |
ee06cf |
ret = -EISCONN;
|
|
Takashi Iwai |
ee06cf |
goto error;
|
|
Takashi Iwai |
ee06cf |
}
|
|
Takashi Iwai |
ee06cf |
+ if (sk->sk_state == LLCP_CONNECTING) {
|
|
Takashi Iwai |
ee06cf |
+ ret = -EINPROGRESS;
|
|
Takashi Iwai |
ee06cf |
+ goto error;
|
|
Takashi Iwai |
ee06cf |
+ }
|
|
Takashi Iwai |
ee06cf |
|
|
Takashi Iwai |
ee06cf |
dev = nfc_get_device(addr->dev_idx);
|
|
Takashi Iwai |
ee06cf |
if (dev == NULL) {
|
|
Takashi Iwai |
ee06cf |
--
|
|
Takashi Iwai |
ee06cf |
2.26.2
|
|
Takashi Iwai |
ee06cf |
|