Revert "ath10k: add sanity check to ie_len before parsing fw/board ie"
PATCH 1/1 Revert "ath10k: add sanity check to ie_len before parsing fw/board ie"
From: Ryan Hsu <[email protected]>
This reverts commit 9ed4f91628737c820af6a1815b65bc06bd31518f.
The commit introduced a regression that over read the ie with the padding.
- the expected IE information
ath10k_pci 0000:03:00.0: found firmware features ie (1 B) ath10k_pci 0000:03:00.0: Enabling feature bit: 6 ath10k_pci 0000:03:00.0: Enabling feature bit: 7 ath10k_pci 0000:03:00.0: featuresath10k_pci 0000:03:00.0: 00000000: c0 00 00 00 00 00 00 00
- the wrong IE with padding is read (0x77)
ath10k_pci 0000:03:00.0: found firmware features ie (4 B) ath10k_pci 0000:03:00.0: Enabling feature bit: 6 ath10k_pci 0000:03:00.0: Enabling feature bit: 7 ath10k_pci 0000:03:00.0: Enabling feature bit: 8 ath10k_pci 0000:03:00.0: Enabling feature bit: 9 ath10k_pci 0000:03:00.0: Enabling feature bit: 10 ath10k_pci 0000:03:00.0: Enabling feature bit: 12 ath10k_pci 0000:03:00.0: Enabling feature bit: 13 ath10k_pci 0000:03:00.0: Enabling feature bit: 14 ath10k_pci 0000:03:00.0: Enabling feature bit: 16 ath10k_pci 0000:03:00.0: Enabling feature bit: 17 ath10k_pci 0000:03:00.0: Enabling feature bit: 18 ath10k_pci 0000:03:00.0: featuresath10k_pci 0000:03:00.0: 00000000: c0 77 07 00 00 00 00 00
--- drivers/net/wireless/ath/ath10k/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +7 -7
@@ -1276,10 +1276,7 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, len -=sizeof (*hdr); data = hdr->data; -/* jump over the padding */ - ie_len =ALIGN (ie_len,4 ); - -if (len < ie_len) { +if (len <ALIGN (ie_len,4 )) {ath10k_err (ar,"invalid length for board ie_id %d ie_len %zu len %zu\n" , ie_id, ie_len, len); ret = -EINVAL ;
@@ -1318,6 +1315,9 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, goto out; } +/* jump over the padding */ + ie_len =ALIGN (ie_len,4 ); + len -= ie_len; data += ie_len; }
@@ -1448,9 +1448,6 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, len -=sizeof (*hdr); data +=sizeof (*hdr); -/* jump over the padding */ - ie_len =ALIGN (ie_len,4 ); -if (len < ie_len) {ath10k_err (ar,"invalid length for FW IE %d (%zu < %zu)\n" , ie_id, len, ie_len);
@@ -1556,6 +1553,9 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,break ; } +/* jump over the padding */ + ie_len =ALIGN (ie_len,4 ); + len -= ie_len; data += ie_len; }
Signature · 1 line
2.7.4
Quoted 85 lines · Kalle Valo
From: Ryan Hsu <[email protected]>
This reverts commit
9ed4f91628737c820af6a1815b65bc06bd31518f.The commit introduced a regression that over read the ie with the padding.
- the expected IE information
ath10k_pci0000:03:00.0: found firmware features ie (1 B)ath10k_pci0000:03:00.0: Enabling feature bit: 6ath10k_pci0000:03:00.0: Enabling feature bit: 7ath10k_pci0000:03:00.0: featuresath10k_pci0000:03:00.0: 00000000: c0 00 00 00 00 00 00 00- the wrong IE with padding is read (
0x77)
ath10k_pci0000:03:00.0: found firmware features ie (4 B)ath10k_pci0000:03:00.0: Enabling feature bit: 6ath10k_pci0000:03:00.0: Enabling feature bit: 7ath10k_pci0000:03:00.0: Enabling feature bit: 8ath10k_pci0000:03:00.0: Enabling feature bit: 9ath10k_pci0000:03:00.0: Enabling feature bit: 10ath10k_pci0000:03:00.0: Enabling feature bit: 12ath10k_pci0000:03:00.0: Enabling feature bit: 13ath10k_pci0000:03:00.0: Enabling feature bit: 14ath10k_pci0000:03:00.0: Enabling feature bit: 16ath10k_pci0000:03:00.0: Enabling feature bit: 17ath10k_pci0000:03:00.0: Enabling feature bit: 18ath10k_pci0000:03:00.0: featuresath10k_pci0000:03:00.0: 00000000: c0 77 07 00 00 00 00 00Signed-off-by Ryan Hsu <[email protected]>Signed-off-by Kalle Valo <[email protected]>--- drivers/net/wireless/ath/ath10k/core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/net/wireless/ath/ath10k/core.c +7
-8@@ -1276,10 +1276,7 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, len -=sizeof (*hdr); data = hdr->data; -/* jump over the padding */ - ie_len =ALIGN (ie_len,4 ); - -if (len < ie_len) { +if (len <ALIGN (ie_len,4 )) {ath10k_err (ar,"invalid length for board ie_id %d ie_len %zu len %zu\n" , ie_id, ie_len, len); ret = -EINVAL ;@@ -1318,6 +1315,9 @@ static int ath10k_core_fetch_board_data_api_n(struct ath10k *ar, goto out; } +/* jump over the padding */ + ie_len =ALIGN (ie_len,4 ); + len -= ie_len; data += ie_len; }@@ -1448,9 +1448,6 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, len -=sizeof (*hdr); data +=sizeof (*hdr); -/* jump over the padding */ - ie_len =ALIGN (ie_len,4 ); -if (len < ie_len) {ath10k_err (ar,"invalid length for FW IE %d (%zu < %zu)\n" , ie_id, len, ie_len);@@ -1556,6 +1553,9 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,break ; } +/* jump over the padding */ + ie_len =ALIGN (ie_len,4 ); + len -= ie_len; data += ie_len; } --
Quoted 2 lines
2.7.4
Sent at HTML the first time sorry
Quoted 30 lines · Kalle Valo
This reverts commit
9ed4f91628737c820af6a1815b65bc06bd31518f.The commit introduced a regression that over read the ie with the padding.
- the expected IE information
ath10k_pci0000:03:00.0: found firmware features ie (1 B)ath10k_pci0000:03:00.0: Enabling feature bit: 6ath10k_pci0000:03:00.0: Enabling feature bit: 7ath10k_pci0000:03:00.0: featuresath10k_pci0000:03:00.0: 00000000: c0 00 00 00 00 00 00 00- the wrong IE with padding is read (
0x77)
ath10k_pci0000:03:00.0: found firmware features ie (4 B)ath10k_pci0000:03:00.0: Enabling feature bit: 6ath10k_pci0000:03:00.0: Enabling feature bit: 7ath10k_pci0000:03:00.0: Enabling feature bit: 8ath10k_pci0000:03:00.0: Enabling feature bit: 9ath10k_pci0000:03:00.0: Enabling feature bit: 10ath10k_pci0000:03:00.0: Enabling feature bit: 12ath10k_pci0000:03:00.0: Enabling feature bit: 13ath10k_pci0000:03:00.0: Enabling feature bit: 14ath10k_pci0000:03:00.0: Enabling feature bit: 16ath10k_pci0000:03:00.0: Enabling feature bit: 17ath10k_pci0000:03:00.0: Enabling feature bit: 18ath10k_pci0000:03:00.0: featuresath10k_pci0000:03:00.0: 00000000: c0 77 07 00 00 00 00 00
Quoted 3 lines
Tested-by Mike Lothian <[email protected]>Signed-off-by Ryan Hsu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-current branch of ath.git, thanks.
9ce8b24aa96e Revert "ath10k: add sanity check to ie_len before parsing fw/board ie"
Signature · 3 lines
https://patchwork.kernel.org/patch/10205215/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Quoted 30 lines · Kalle Valo
This reverts commit
9ed4f91628737c820af6a1815b65bc06bd31518f.The commit introduced a regression that over read the ie with the padding.
- the expected IE information
ath10k_pci0000:03:00.0: found firmware features ie (1 B)ath10k_pci0000:03:00.0: Enabling feature bit: 6ath10k_pci0000:03:00.0: Enabling feature bit: 7ath10k_pci0000:03:00.0: featuresath10k_pci0000:03:00.0: 00000000: c0 00 00 00 00 00 00 00- the wrong IE with padding is read (
0x77)
ath10k_pci0000:03:00.0: found firmware features ie (4 B)ath10k_pci0000:03:00.0: Enabling feature bit: 6ath10k_pci0000:03:00.0: Enabling feature bit: 7ath10k_pci0000:03:00.0: Enabling feature bit: 8ath10k_pci0000:03:00.0: Enabling feature bit: 9ath10k_pci0000:03:00.0: Enabling feature bit: 10ath10k_pci0000:03:00.0: Enabling feature bit: 12ath10k_pci0000:03:00.0: Enabling feature bit: 13ath10k_pci0000:03:00.0: Enabling feature bit: 14ath10k_pci0000:03:00.0: Enabling feature bit: 16ath10k_pci0000:03:00.0: Enabling feature bit: 17ath10k_pci0000:03:00.0: Enabling feature bit: 18ath10k_pci0000:03:00.0: featuresath10k_pci0000:03:00.0: 00000000: c0 77 07 00 00 00 00 00
Quoted 3 lines
Tested-by Mike Lothian <[email protected]>Signed-off-by Ryan Hsu <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-current branch of ath.git, thanks.
9ce8b24aa96e Revert "ath10k: add sanity check to ie_len before parsing fw/board ie"
Signature · 9 lines
https://patchwork.kernel.org/patch/10205215/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k