diff options
| author | Lin Ma <linma@zju.edu.cn> | 2021-10-07 19:44:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-27 09:34:00 +0200 |
| commit | 8a44904ce83ebcb1281b04c8d37ad7f8ab537a3d (patch) | |
| tree | 76ff727e5d07082e1f2f685b832b118b429cd349 /net | |
| parent | 5b6ce310023ede06eb0eebe7f2133e0df87e6cbd (diff) | |
| download | linux-8a44904ce83ebcb1281b04c8d37ad7f8ab537a3d.tar.gz linux-8a44904ce83ebcb1281b04c8d37ad7f8ab537a3d.tar.bz2 linux-8a44904ce83ebcb1281b04c8d37ad7f8ab537a3d.zip | |
nfc: nci: fix the UAF of rf_conn_info object
commit 1b1499a817c90fd1ce9453a2c98d2a01cca0e775 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 e3bbf1937d0e..7681f89dc312 100644 --- a/net/nfc/nci/rsp.c +++ b/net/nfc/nci/rsp.c @@ -289,6 +289,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); } } |