From: Lin Ma <linma@zju.edu.cn>
To: linux-nfc@lists.01.org
Subject: [PATCH] NFC: NULL out conn_info reference when conn is closed
Date: Wed, 13 Oct 2021 12:30:52 +0800 [thread overview]
Message-ID: <20211013043052.16379-1-linma@zju.edu.cn> (raw)
[-- Attachment #1: Type: text/plain, Size: 1661 bytes --]
The nci_core_conn_close_rsp_packet() function will release the conn_info
with given conn_id. However, this reference of this object may still held
by other places like ndev->rf_conn_info in routine:
.. -> nci_recv_frame()
-> nci_rx_work()
-> nci_rsp_packet()
-> nci_rf_disc_rsp_packet()
-> devm_kzalloc()
ndev->rf_conn_info = conn_info;
or ndev->hci_dev->conn_info in routine:
.. -> nci_recv_frame()
-> nci_rx_work()
-> nci_rsp_packet()
-> nci_core_conn_create_rsp_packet()
-> devm_kzalloc()
ndev->hci_dev->conn_info = conn_info;
If these two places are not NULL out, potential UAF can be exploited by
the attacker when emulating an UART NFC device. This patch compares the
deallocating object with the two places and writes NULL to prevent that.
Signed-off-by: Lin Ma <linma@zju.edu.cn>
---
net/nfc/nci/rsp.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c
index a2e72c003805..99de76e5e855 100644
--- a/net/nfc/nci/rsp.c
+++ b/net/nfc/nci/rsp.c
@@ -334,6 +334,14 @@ static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev,
ndev->cur_conn_id);
if (conn_info) {
list_del(&conn_info->list);
+ /* Other places held conn_info like
+ * ndev->hci_dev->conn_info, ndev->rf_conn_info
+ * need to be NULL out.
+ */
+ if (ndev->hci_dev->conn_info == conn_info)
+ ndev->hci_dev->conn_info = NULL;
+ if (ndev->rf_conn_info == conn_info)
+ ndev->rf_conn_info = NULL;
devm_kfree(&ndev->nfc_dev->dev, conn_info);
}
}
--
2.33.0
reply other threads:[~2021-10-13 4:30 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211013043052.16379-1-linma@zju.edu.cn \
--to=linma@zju.edu.cn \
--cc=linux-nfc@lists.01.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).