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

Commit c13b9f6b authored by Etan Cohen's avatar Etan Cohen
Browse files

[NAN] Add (T)LV validation testing 

Test for validity of a (T)LV. Used in construction of publish and
subscribe configuration (both Tx and Rx filters).

Bug: 30007730
Change-Id: Ibf2179121d45c582bb054c06ec2a765ed0927040
parent adfbfb3a

wifi/java/android/net/wifi/nan/PublishConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -300,10 +300,18 @@ public class PublishConfig implements Parcelable { 
            throw new IllegalArgumentException(

                    "Non-matching combination of txFilter and txFilterLength");

        }

        if (!TlvBufferUtils.isValid(mTxFilter, mTxFilterLength, 0, 1)) {

            throw new IllegalArgumentException(

                    "Invalid txFilter configuration - LV fields do not match up to length");

        }

        if (mRxFilterLength != 0 && (mRxFilter == null || mRxFilter.length < mRxFilterLength)) {

            throw new IllegalArgumentException(

                    "Non-matching combination of rxFilter and rxFilterLength");

        }

        if (!TlvBufferUtils.isValid(mRxFilter, mRxFilterLength, 0, 1)) {

            throw new IllegalArgumentException(

                    "Invalid rxFilter configuration - LV fields do not match up to length");

        }

        if (mPublishType < PUBLISH_TYPE_UNSOLICITED || mPublishType > PUBLISH_TYPE_SOLICITED) {

            throw new IllegalArgumentException("Invalid publishType - " + mPublishType);

        }

wifi/java/android/net/wifi/nan/SubscribeConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -327,10 +327,18 @@ public class SubscribeConfig implements Parcelable { 
            throw new IllegalArgumentException(

                    "Non-matching combination of txFilter and txFilterLength");

        }

        if (!TlvBufferUtils.isValid(mTxFilter, mTxFilterLength, 0, 1)) {

            throw new IllegalArgumentException(

                    "Invalid txFilter configuration - LV fields do not match up to length");

        }

        if (mRxFilterLength != 0 && (mRxFilter == null || mRxFilter.length < mRxFilterLength)) {

            throw new IllegalArgumentException(

                    "Non-matching combination of rxFilter and rxFilterLength");

        }

        if (!TlvBufferUtils.isValid(mRxFilter, mRxFilterLength, 0, 1)) {

            throw new IllegalArgumentException(

                    "Invalid rxFilter configuration - LV fields do not match up to length");

        }

        if (mSubscribeType < SUBSCRIBE_TYPE_PASSIVE || mSubscribeType > SUBSCRIBE_TYPE_ACTIVE) {

            throw new IllegalArgumentException("Invalid subscribeType - " + mSubscribeType);

        }

wifi/java/android/net/wifi/nan/TlvBufferUtils.java

+39 −0
Original line number Diff line number Diff line
@@ -488,4 +488,43 @@ public class TlvBufferUtils { 
            };

        }

    }



    /**

     * Validates that a (T)LV array is constructed correctly. I.e. that its specified Length

     * fields correctly fill the specified length (and do not overshoot).

     *

     * @param array The (T)LV array to verify.

     * @param length The number of bytes in the array to consider (starting at offset 0).

     * @param typeSize The size (in bytes) of the type field. Valid values are 0, 1, or 2.

     * @param lengthSize The size (in bytes) of the length field. Valid values are 1 or 2.

     * @return A boolean indicating whether the array is valid (true) or invalid (false).

     */

    public static boolean isValid(byte[] array, int length, int typeSize, int lengthSize) {

        if (typeSize < 0 || typeSize > 2) {

            throw new IllegalArgumentException(

                    "Invalid arguments - typeSize must be 0, 1, or 2: typeSize=" + typeSize);

        }

        if (lengthSize <= 0 || lengthSize > 2) {

            throw new IllegalArgumentException(

                    "Invalid arguments - lengthSize must be 1 or 2: lengthSize=" + lengthSize);

        }

        if (length < 0 || length > array.length) {

            throw new IllegalArgumentException(

                    "Invalid arguments - length must be non-negative and <= array.length: length="

                            + length + ", array.length=" + array.length);

        }



        int nextTlvIndex = 0;

        while (nextTlvIndex + typeSize + lengthSize <= length) {

            nextTlvIndex += typeSize;

            if (lengthSize == 1) {

                nextTlvIndex += lengthSize + array[nextTlvIndex];

            } else {

                nextTlvIndex += lengthSize + Memory.peekShort(array, nextTlvIndex,

                        ByteOrder.BIG_ENDIAN);

            }

        }



        return nextTlvIndex == length;

    }

}