diff options
| author | Lin Ma <linma@zju.edu.cn> | 2021-10-07 19:44:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-08 17:24:32 +0100 |
| commit | 1b1499a817c90fd1ce9453a2c98d2a01cca0e775 (patch) | |
| tree | 4d49ead6174f2e3dfbf98a98cfd502079c1bdd73 /net/nfc | |
| parent | 95f7f3e7dc6bd2e735cb5de11734ea2222b1e05a (diff) | |
| download | linux-1b1499a817c90fd1ce9453a2c98d2a01cca0e775.tar.gz | |
nfc: nci: fix the UAF of rf_conn_info object
The nci_core_conn_close_rsp_packet() function will release the conn_info with given conn_id. However, it needs to set the rf_conn_info to NULL to prevent other routines like nci_rf_intf_activated_ntf_packet() to trigger the UAF. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: Lin Ma <linma@zju.edu.cn> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/rsp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c index a2e72c003805..b911ab78bed9 100644 --- a/net/nfc/nci/rsp.c +++ b/net/nfc/nci/rsp.c @@ -334,6 +334,8 @@ static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev, ndev->cur_conn_id); if (conn_info) { list_del(&conn_info->list); + if (conn_info == ndev->rf_conn_info) + ndev->rf_conn_info = NULL; devm_kfree(&ndev->nfc_dev->dev, conn_info); } } |