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

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

init: accept -1 or 'unlimited' for an infinite rlimit 

Due to a bug with ParseUint(), init would defacto accept -1 for an
infinite rlimit, but only on 64bit devices.  That bug is now fixed,
such that -1 would be rejected by ParseUint() for all devices.

This change explicitly checks for -1 for all devices or 'unlimited' to
match ulimit's reporting and accepts either as an infinite rlimit.

Bug: 112668205
Test: new (and old) unit tests
Change-Id: Ie28ff622cdf375a65ceb5f32ffb14fb3d5d9f2ba
parent 8e3f0b1b

init/README.md

+1 −0
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ Commands 
  _resource_ is best specified using its text representation ('cpu', 'rtio', etc

  or 'RLIM_CPU', 'RLIM_RTIO', etc). It also may be specified as the int value

  that the resource enum corresponds to.

  _cur_ and _max_ can be 'unlimited' or '-1' to indicate an infinite rlimit.



`start <service>`

> Start a service running if it is not already running.

init/rlimit_parser.cpp

+8 −2
Original line number Diff line number Diff line
@@ -65,12 +65,18 @@ Result<std::pair<int, rlimit>> ParseRlimit(const std::vector<std::string>& args) 
    }



    rlimit limit;

    if (!ParseUint(args[2], &limit.rlim_cur)) {

    if (args[2] == "-1" || args[2] == "unlimited") {

        limit.rlim_cur = RLIM_INFINITY;

    } else if (!ParseUint(args[2], &limit.rlim_cur)) {

        return Error() << "Could not parse soft limit '" << args[2] << "'";

    }

    if (!ParseUint(args[3], &limit.rlim_max)) {



    if (args[3] == "-1" || args[3] == "unlimited") {

        limit.rlim_max = RLIM_INFINITY;

    } else if (!ParseUint(args[3], &limit.rlim_max)) {

        return Error() << "Could not parse hard limit '" << args[3] << "'";

    }



    return {resource, limit};

}

init/rlimit_parser_test.cpp

+60 −56
Original line number Diff line number Diff line
@@ -96,10 +96,10 @@ TEST(rlimit, RlimitSuccess) { 
                    {{"9", "10", "10"}, {9, {10, 10}}},

                    {{"10", "10", "10"}, {10, {10, 10}}},

                    {{"11", "10", "10"}, {11, {10, 10}}},

            {{"12", "10", "10"}, {12, {10, 10}}},

            {{"13", "10", "10"}, {13, {10, 10}}},

            {{"14", "10", "10"}, {14, {10, 10}}},

            {{"15", "10", "10"}, {15, {10, 10}}},

                    {{"12", "unlimited", "10"}, {12, {RLIM_INFINITY, 10}}},

                    {{"13", "-1", "10"}, {13, {RLIM_INFINITY, 10}}},

                    {{"14", "10", "unlimited"}, {14, {10, RLIM_INFINITY}}},

                    {{"15", "10", "-1"}, {15, {10, RLIM_INFINITY}}},

            };



    for (const auto& [input, expected_result] : inputs_and_results) {
@@ -115,6 +115,10 @@ TEST(rlimit, RlimitFailure) { 
            {{"RLIM_", "10", "10"}, "Could not parse resource 'RLIM_'"},

            {{"cpu", "abc", "10"}, "Could not parse soft limit 'abc'"},

            {{"cpu", "10", "abc"}, "Could not parse hard limit 'abc'"},

            {{"cpu", "unlimit", "10"}, "Could not parse soft limit 'unlimit'"},

            {{"cpu", "10", "unlimit"}, "Could not parse hard limit 'unlimit'"},

            {{"cpu", "-2", "10"}, "Could not parse soft limit '-2'"},

            {{"cpu", "10", "-2"}, "Could not parse hard limit '-2'"},

    };



    for (const auto& [input, expected_result] : inputs_and_results) {