nfc: nci: fix use of uninitialized memory in NFC-DEP general bytes
Subsystems (4)
PATCH v2 1/1 nfc: nci: fix use of uninitialized memory in NFC-DEP general bytes
nci_store_general_bytes_nfc_dep() derives the length of the NFC-DEP general bytes by subtracting the fixed general-bytes offset from the ATR length:
atr_res_len - NFC_ATR_RES_GT_OFFSET (poll, offset 15)
atr_req_len - NFC_ATR_REQ_GT_OFFSET (listen, offset 14)
It never checks that the ATR is at least that long. When a RF_INTF_ACTIVATED_NTF reports an ATR shorter than the offset the subtraction is negative; because min_t() casts its arguments to __u8 the negative value becomes large and is then capped at NFC_ATR_RES_GB_MAXSIZE / NFC_ATR_REQ_GB_MAXSIZE. remote_gb_len is thus set to up to 47/48 even though only atr_res_len/atr_req_len bytes of the on-stack atr_res/atr_req buffer were copied from the packet, and the following memcpy() reads the uninitialized remainder into ndev->remote_gb.
Zero remote_gb_len and skip storing the general bytes when the ATR is shorter than the general-bytes offset, so that a stale remote_gb_len from a previous activation does not survive into the new session.
--- net/nfc/nci/ntf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/nfc/nci/ntf.c +6 -2
@@ -654,8 +654,10 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev,case NCI_NFC_A_PASSIVE_POLL_MODE :case NCI_NFC_F_PASSIVE_POLL_MODE :if (ntf->activation_params.poll_nfc_dep.atr_res_len < -NFC_ATR_RES_GT_OFFSET ) +NFC_ATR_RES_GT_OFFSET ) { + ndev->remote_gb_len =0 ;break ; + } ndev->remote_gb_len = min_t(__u8, (ntf->activation_params.poll_nfc_dep.atr_res_len - NFC_ATR_RES_GT_OFFSET),
@@ -669,8 +671,10 @@ static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev,case NCI_NFC_A_PASSIVE_LISTEN_MODE :case NCI_NFC_F_PASSIVE_LISTEN_MODE :if (ntf->activation_params.listen_nfc_dep.atr_req_len < -NFC_ATR_REQ_GT_OFFSET ) +NFC_ATR_REQ_GT_OFFSET ) { + ndev->remote_gb_len =0 ;break ; + } ndev->remote_gb_len = min_t(__u8, (ntf->activation_params.listen_nfc_dep.atr_req_len - NFC_ATR_REQ_GT_OFFSET),
Signature · 1 line
2.54.0
David Heidelberg
maintainerQuoted 21 lines · Muhammad Bilal
nci_store_general_bytes_nfc_dep()derives the length of the NFC-DEP general bytes by subtracting the fixed general-bytes offset from the ATR length:
atr_res_len-NFC_ATR_RES_GT_OFFSET(poll, offset 15)
atr_req_len-NFC_ATR_REQ_GT_OFFSET(listen, offset 14)It never checks that the ATR is at least that long. When a
RF_INTF_ACTIVATED_NTFreports an ATR shorter than the offset the subtraction is negative; becausemin_t()casts its arguments to__u8the negative value becomes large and is then capped atNFC_ATR_RES_GB_MAXSIZE/NFC_ATR_REQ_GB_MAXSIZE.remote_gb_lenis thus set to up to 47/48 even though only atr_res_len/atr_req_len bytes of the on-stack atr_res/atr_req buffer were copied from the packet, and the followingmemcpy()reads the uninitialized remainder intondev->remote_gb.Zero
remote_gb_lenand skip storing the general bytes when the ATR is shorter than the general-bytes offset, so that a staleremote_gb_lenfrom a previous activation does not survive into the new session.
Quoted 7 lines
Fixes a99903ec4566 ("NFC: NCI: Handle Target mode activation")Signed-off-by Muhammad Bilal <[email protected]>--- net/nfc/nci/ntf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Hello Muhammad,
could you please rebase the patch on the currect version for-linus or for-next?
Thank you
David