Skip to content

Commit e285d5b

Browse files
surenbaghdasaryandavem330
authored andcommitted
NFC: Fix the number of pipes
According to ETSI TS 102 622 specification chapter 4.4 pipe identifier is 7 bits long which allows for 128 unique pipe IDs. Because NFC_HCI_MAX_PIPES is used as the number of pipes supported and not as the max pipe ID, its value should be 128 instead of 127. nfc_hci_recv_from_llc extracts pipe ID from packet header using NFC_HCI_FRAGMENT(0x7F) mask which allows for pipe ID value of 127. Same happens when NCI_HCP_MSG_GET_PIPE() is being used. With pipes array having only 127 elements and pipe ID of 127 the OOB memory access will result. Cc: Samuel Ortiz <[email protected]> Cc: Allen Pais <[email protected]> Cc: "David S. Miller" <[email protected]> Suggested-by: Dan Carpenter <[email protected]> Signed-off-by: Suren Baghdasaryan <[email protected]> Reviewed-by: Kees Cook <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 674d9de commit e285d5b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/net/nfc/hci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ struct nfc_hci_pipe {
8787
* According to specification 102 622 chapter 4.4 Pipes,
8888
* the pipe identifier is 7 bits long.
8989
*/
90-
#define NFC_HCI_MAX_PIPES 127
90+
#define NFC_HCI_MAX_PIPES 128
9191
struct nfc_hci_init_data {
9292
u8 gate_count;
9393
struct nfc_hci_gate gates[NFC_HCI_MAX_CUSTOM_GATES];

0 commit comments

Comments
 (0)