824605 - B2G RIL: read length in getSPDI is wrong.

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect)

Description

[Patrick Wang (Chih-Kai Wang) (:kk1fff)]

readLen records the bytes that have been read by getSPDI function, and the left bytes are consumed in the end of the function if readLen is less then length. readLen is octet length while length is character length, so readLen is always less than length and cause exception in getSPDI() function.

bb? for getSPDI is a part of a bb+ bug, 793111.

Comment 1

[Patrick Wang (Chih-Kai Wang) (:kk1fff)]

Attachment: Patch: Fix readLen in getSPDI function

Comment 2

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Comment on attachment 695605 [details] [diff] [review]
Patch: Fix readLen in getSPDI function

Review of attachment 695605 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/system/gonk/ril_worker.js
@@ +1564,5 @@
>        this.iccInfoPrivate.SPDI = null;
>        while ((readLen < length) && !endLoop) {
>          tlvTag = GsmPDUHelper.readHexOctet();
>          tlvLen = GsmPDUHelper.readHexOctet();
> +        readLen += (2 * 2); // For tag and length fields.

Please use octet as units, as other functions all do this.
Also your tlvLen is measured in 'octets'.
Same as below.

@@ +1578,5 @@
>            break;
>          default:
>            // We don't care about its content if its tag is not SPDI nor
>            // PLMN_LIST.
>            GsmPDUHelper.readHexOctetArray(tlvLen);

Use Buf.seekIncoming(tlvLen * PDU_HEX_OCTET_SIZE)

@@ +1584,5 @@
>          }
>        }
>  
>        // Consume unread octets.
> +      while (readLen < length) {

You should covert length to available octets here.
And you could use Buf.seekIncoming for skipping those unused bytes.

Comment 3

[Patrick Wang (Chih-Kai Wang) (:kk1fff)]

Attachment: Patch: Fix readLen in getSPDI function v2

Use octet as unit of readLen variable.

Comment 4

[Patrick Wang (Chih-Kai Wang) (:kk1fff)]

Attachment: Patch: Fix readLen in getSPDI function v3

Comment 5

[Yoshi Cheng-Hao Huang [:allstars.chh][:allstarschh][:yoshi]]

Comment on attachment 695633 [details] [diff] [review]
Patch: Fix readLen in getSPDI function v3

Review of attachment 695633 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/system/gonk/ril_worker.js
@@ +1575,5 @@
>            break;
>          default:
>            // We don't care about its content if its tag is not SPDI nor
>            // PLMN_LIST.
> +          endLoop = true;

nit, break;

Comment 6

[Patrick Wang (Chih-Kai Wang) (:kk1fff)]

Attachment: Patch for checking in

r+ in comment 5. fix according to comment 5.

Comment 7

[Patrick Wang (Chih-Kai Wang) (:kk1fff)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/54e72e8bbac4

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/54e72e8bbac4

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/a4a251e6ca66
https://hg.mozilla.org/releases/mozilla-b2g18/rev/d6bcda76a34d