| Message ID | 20240916122230.114800-2-matthieu@buffet.re (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
| Series | landlock: Add UDP access control support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch, async |
Thanks for these patches, they look really good! I'll review all of them soon. CCing Konstantin and Mikhail who work on network support. On Mon, Sep 16, 2024 at 02:22:24PM +0200, Matthieu Buffet wrote: > Unlike LL_FS_RO and LL_FS_RW, LL_TCP_* are currently optional: either > don't specify them and these access rights won't be in handled_accesses, > or specify them and only the values passed are allowed. > > If you want to specify that no port can be bind()ed, you would think > (looking at the code quickly) that setting LL_TCP_BIND="" would do it. > Due to a quirk in the parsing logic and the use of atoi() returning 0 with > no error checking for empty strings, you end up allowing bind(0) (which > means bind to any ephemeral port) without realising it. The same occurred > when leaving a trailing/leading colon (e.g. "80:"). Well spotted, thanks for this fix! Can you please send a standalone patch series with this patch and the next one? I'll merge the fixes soon and it will shrink the UDP specific series. > > To reproduce: > export LL_FS_RO="/" LL_FS_RW="" LL_TCP_BIND="" > > ---8<----- Before this patch: > ./sandboxer strace -e bind nc -n -vvv -l -p 0 > Executing the sandboxed command... > bind(3, {sa_family=AF_INET, sin_port=htons(0), > sin_addr=inet_addr("0.0.0.0")}, 16) = 0 > Listening on 0.0.0.0 37629 > > ---8<----- Expected: When applying this patch, only the following text gets in the commit message. I guess that's because of the previous "---". > ./sandboxer strace -e bind nc -n -vvv -l -p 0 > Executing the sandboxed command... > bind(3, {sa_family=AF_INET, sin_port=htons(0), > sin_addr=inet_addr("0.0.0.0")}, 16) = -1 EACCES (Permission denied) > nc: Permission denied > You can add this tag for this fix to be backported: Fixes: 5e990dcef12e ("samples/landlock: Support TCP restrictions") > Signed-off-by: Matthieu Buffet <matthieu@buffet.re> > --- > samples/landlock/sandboxer.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/samples/landlock/sandboxer.c b/samples/landlock/sandboxer.c > index e8223c3e781a..a84ae3a15482 100644 > --- a/samples/landlock/sandboxer.c > +++ b/samples/landlock/sandboxer.c > @@ -168,7 +168,18 @@ static int populate_ruleset_net(const char *const env_var, const int ruleset_fd, > > env_port_name_next = env_port_name; > while ((strport = strsep(&env_port_name_next, ENV_DELIMITER))) { > - net_port.port = atoi(strport); > + char *strport_num_end = NULL; > + > + if (strcmp(strport, "") == 0) > + continue; > + > + errno = 0; > + net_port.port = strtol(strport, &strport_num_end, 0); Using strtol(3) is a good idea, for instance to check overflows. You can talk about that in the commit message. > + if (errno != 0 || strport_num_end == strport) { I was thinking about checking the return value instead of errno, but it looks like the strtol() API may set errno while returning an unspecified value, so your approach looks good. > + fprintf(stderr, > + "Failed to parse port at \"%s\"\n", strport); > + goto out_free_name; > + } > if (landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_PORT, > &net_port, 0)) { > fprintf(stderr, > -- > 2.39.5 > >
On 9/16/2024 3:22 PM, Matthieu Buffet wrote: > Unlike LL_FS_RO and LL_FS_RW, LL_TCP_* are currently optional: either > don't specify them and these access rights won't be in handled_accesses, > or specify them and only the values passed are allowed. > > If you want to specify that no port can be bind()ed, you would think > (looking at the code quickly) that setting LL_TCP_BIND="" would do it. > Due to a quirk in the parsing logic and the use of atoi() returning 0 with > no error checking for empty strings, you end up allowing bind(0) (which > means bind to any ephemeral port) without realising it. The same occurred > when leaving a trailing/leading colon (e.g. "80:"). > > To reproduce: > export LL_FS_RO="/" LL_FS_RW="" LL_TCP_BIND="" > > ---8<----- Before this patch: > ./sandboxer strace -e bind nc -n -vvv -l -p 0 > Executing the sandboxed command... > bind(3, {sa_family=AF_INET, sin_port=htons(0), > sin_addr=inet_addr("0.0.0.0")}, 16) = 0 > Listening on 0.0.0.0 37629 > > ---8<----- Expected: > ./sandboxer strace -e bind nc -n -vvv -l -p 0 > Executing the sandboxed command... > bind(3, {sa_family=AF_INET, sin_port=htons(0), > sin_addr=inet_addr("0.0.0.0")}, 16) = -1 EACCES (Permission denied) > nc: Permission denied > > Signed-off-by: Matthieu Buffet <matthieu@buffet.re> > --- > samples/landlock/sandboxer.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) > > diff --git a/samples/landlock/sandboxer.c b/samples/landlock/sandboxer.c > index e8223c3e781a..a84ae3a15482 100644 > --- a/samples/landlock/sandboxer.c > +++ b/samples/landlock/sandboxer.c > @@ -168,7 +168,18 @@ static int populate_ruleset_net(const char *const env_var, const int ruleset_fd, > > env_port_name_next = env_port_name; > while ((strport = strsep(&env_port_name_next, ENV_DELIMITER))) { > - net_port.port = atoi(strport); > + char *strport_num_end = NULL; > + > + if (strcmp(strport, "") == 0) > + continue; > + > + errno = 0; > + net_port.port = strtol(strport, &strport_num_end, 0); > + if (errno != 0 || strport_num_end == strport) { > + fprintf(stderr, > + "Failed to parse port at \"%s\"\n", strport); > + goto out_free_name; > + } Probably it'll be better to make a separate function for strtol conversion (e.g. [1])? It might be needed for the socket type control patchset [2]. [1] https://lore.kernel.org/all/20240904104824.1844082-18-ivanov.mikhail1@huawei-partners.com/ [2] https://lore.kernel.org/all/20240904104824.1844082-19-ivanov.mikhail1@huawei-partners.com/ > if (landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_PORT, > &net_port, 0)) { > fprintf(stderr,
diff --git a/samples/landlock/sandboxer.c b/samples/landlock/sandboxer.c index e8223c3e781a..a84ae3a15482 100644 --- a/samples/landlock/sandboxer.c +++ b/samples/landlock/sandboxer.c @@ -168,7 +168,18 @@ static int populate_ruleset_net(const char *const env_var, const int ruleset_fd, env_port_name_next = env_port_name; while ((strport = strsep(&env_port_name_next, ENV_DELIMITER))) { - net_port.port = atoi(strport); + char *strport_num_end = NULL; + + if (strcmp(strport, "") == 0) + continue; + + errno = 0; + net_port.port = strtol(strport, &strport_num_end, 0); + if (errno != 0 || strport_num_end == strport) { + fprintf(stderr, + "Failed to parse port at \"%s\"\n", strport); + goto out_free_name; + } if (landlock_add_rule(ruleset_fd, LANDLOCK_RULE_NET_PORT, &net_port, 0)) { fprintf(stderr,
Unlike LL_FS_RO and LL_FS_RW, LL_TCP_* are currently optional: either don't specify them and these access rights won't be in handled_accesses, or specify them and only the values passed are allowed. If you want to specify that no port can be bind()ed, you would think (looking at the code quickly) that setting LL_TCP_BIND="" would do it. Due to a quirk in the parsing logic and the use of atoi() returning 0 with no error checking for empty strings, you end up allowing bind(0) (which means bind to any ephemeral port) without realising it. The same occurred when leaving a trailing/leading colon (e.g. "80:"). To reproduce: export LL_FS_RO="/" LL_FS_RW="" LL_TCP_BIND="" ---8<----- Before this patch: ./sandboxer strace -e bind nc -n -vvv -l -p 0 Executing the sandboxed command... bind(3, {sa_family=AF_INET, sin_port=htons(0), sin_addr=inet_addr("0.0.0.0")}, 16) = 0 Listening on 0.0.0.0 37629 ---8<----- Expected: ./sandboxer strace -e bind nc -n -vvv -l -p 0 Executing the sandboxed command... bind(3, {sa_family=AF_INET, sin_port=htons(0), sin_addr=inet_addr("0.0.0.0")}, 16) = -1 EACCES (Permission denied) nc: Permission denied Signed-off-by: Matthieu Buffet <matthieu@buffet.re> --- samples/landlock/sandboxer.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)