diff options
| author | Ivanov Mikhail <ivanov.mikhail1@huawei-partners.com> | 2024-03-26 12:56:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-05-30 10:49:49 +0300 |
| commit | 8607fbc7bb7fb0c7f7ba045c09b6d87dca49a2a6 (patch) | |
| tree | 6570abe69b55ba7dfcdd9235878cb6fc377c1936 | |
| parent | 6564fc1818404254d1c9f7d75b403b4941516d26 (diff) | |
| download | linux-8607fbc7bb7fb0c7f7ba045c09b6d87dca49a2a6.tar.xz | |
samples/landlock: Fix incorrect free in populate_ruleset_net
[ Upstream commit 42212936d9d811c7cf6efc4804747a6c417aafd4 ]
Pointer env_port_name changes after strsep(). Memory allocated via
strdup() will not be freed if landlock_add_rule() returns non-zero value.
Fixes: 5e990dcef12e ("samples/landlock: Support TCP restrictions")
Signed-off-by: Ivanov Mikhail <ivanov.mikhail1@huawei-partners.com>
Reviewed-by: Konstantin Meskhidze <konstantin.meskhidze@huawei.com>
Link: https://lore.kernel.org/r/20240326095625.3576164-1-ivanov.mikhail1@huawei-partners.com
Signed-off-by: Mickaël Salaün <mic@digikod.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | samples/landlock/sandboxer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/samples/landlock/sandboxer.c b/samples/landlock/sandboxer.c index 08596c0ef070..e6c59f688573 100644 --- a/samples/landlock/sandboxer.c +++ b/samples/landlock/sandboxer.c @@ -151,7 +151,7 @@ static int populate_ruleset_net(const char *const env_var, const int ruleset_fd, const __u64 allowed_access) { int ret = 1; - char *env_port_name, *strport; + char *env_port_name, *env_port_name_next, *strport; struct landlock_net_port_attr net_port = { .allowed_access = allowed_access, .port = 0, @@ -163,7 +163,8 @@ static int populate_ruleset_net(const char *const env_var, const int ruleset_fd, env_port_name = strdup(env_port_name); unsetenv(env_var); - while ((strport = strsep(&env_port_name, ENV_DELIMITER))) { + env_port_name_next = env_port_name; + while ((strport = strsep(&env_port_name_next, ENV_DELIMITER))) { net_port.port = atoi(strport); if (landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_PORT, &net_port, 0)) { |