Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ac0d736 authored by Lin Ma's avatar Lin Ma Committed by Greg Kroah-Hartman
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarLin Ma <linma@zju.edu.cn>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21e23e4c

net/nfc/nci/rsp.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

		}

	}