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

Commit ee0610e8 authored by Tom Cherry's avatar Tom Cherry
Browse files

Add compile time check that friendly AID names are < 32 characters 

There is an internal buffer in bionic for user/group names that is 32
characters long including the trailing null, so we must restrict the
length of these names during compile time.

Bug: 27999086
Test: Successfully compile a valid config.fs
Test: Fail to compile a config.fs with AID name > 31 characters
Change-Id: I7fe887c630dd4d1033b86a5d8332480eb3b0fa07
parent 74413198

tools/fs_config/fs_config_generator.py

+12 −5
Original line number Diff line number Diff line
@@ -146,18 +146,27 @@ class AID(object): 
            found (str): The file found in, not required to be specified.



        Raises:

            ValueError: if the friendly name is longer than 31 characters as

                that is bionic's internal buffer size for name.

            ValueError: if value is not a valid string number as processed by

                int(x, 0)

        """

        self.identifier = identifier

        self.value = value

        self.found = found

        try:

            self.normalized_value = str(int(value, 0))

        except ValueException:

            raise ValueError('Invalid "value", not aid number, got: \"%s\"' % value)



        # Where we calculate the friendly name

        friendly = identifier[len(AID.PREFIX):].lower()

        self.friendly = AID._fixup_friendly(friendly)



        if len(self.friendly) > 31:

            raise ValueError('AID names must be under 32 characters "%s"' % self.friendly)





    def __eq__(self, other):



        return self.identifier == other.identifier \
@@ -639,10 +648,8 @@ class FSConfigFileParser(object): 


        try:

            aid = AID(section_name, value, file_name)

        except ValueError:

            sys.exit(

                error_message('Invalid "value", not aid number, got: \"%s\"' %

                              value))

        except ValueError as exception:

            sys.exit(error_message(exception))



        # Values must be within OEM range

        if not Utils.in_any_range(int(aid.value, 0), self._oem_ranges):