| Message ID | 20190227012132.16271-1-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Allow -sandbox off with --disable-seccomp | expand |
Hi On Wed, Feb 27, 2019 at 2:22 AM David Gibson <david@gibson.dropbear.id.au> wrote: > > At present, when seccomp support is compiled out with --disable-seccomp > we fail with an error if the user puts -sandbox on the command line. > > That kind of makes sense, but it's a bit strange that we reject a request > to disable sandboxing with "-sandbox off" saying we don't support > sandboxing. > > This puts in a small sandbox to (correctly) silently ignore -sandbox off > when we don't have sandboxing support compiled in. This makes life easier > for testcases, since they can safely specify "-sandbox off" without having > to care if the qemu they're using is compiled with sandbox support or not. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > vl.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/vl.c b/vl.c > index 502857a176..9d5f1b7ebb 100644 > --- a/vl.c > +++ b/vl.c > @@ -3857,9 +3857,11 @@ int main(int argc, char **argv, char **envp) > exit(1); > } > #else > - error_report("-sandbox support is not enabled " > - "in this QEMU binary"); > - exit(1); > + if (!g_str_equal(optarg, "off")) { > + error_report("-sandbox support is not enabled " > + "in this QEMU binary"); > + exit(1); > + } > #endif > break; > case QEMU_OPTION_add_fd: > -- > 2.20.1 > >
On Wed, Feb 27, 2019 at 12:21:32PM +1100, David Gibson wrote: > At present, when seccomp support is compiled out with --disable-seccomp > we fail with an error if the user puts -sandbox on the command line. > > That kind of makes sense, but it's a bit strange that we reject a request > to disable sandboxing with "-sandbox off" saying we don't support > sandboxing. > > This puts in a small sandbox to (correctly) silently ignore -sandbox off > when we don't have sandboxing support compiled in. This makes life easier > for testcases, since they can safely specify "-sandbox off" without having > to care if the qemu they're using is compiled with sandbox support or not. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > vl.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
On Wed, Feb 27, 2019 at 12:21:32PM +1100, David Gibson wrote: > At present, when seccomp support is compiled out with --disable-seccomp > we fail with an error if the user puts -sandbox on the command line. > > That kind of makes sense, but it's a bit strange that we reject a request > to disable sandboxing with "-sandbox off" saying we don't support > sandboxing. > > This puts in a small sandbox to (correctly) silently ignore -sandbox off > when we don't have sandboxing support compiled in. This makes life easier > for testcases, since they can safely specify "-sandbox off" without having > to care if the qemu they're using is compiled with sandbox support or not. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > vl.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/vl.c b/vl.c > index 502857a176..9d5f1b7ebb 100644 > --- a/vl.c > +++ b/vl.c > @@ -3857,9 +3857,11 @@ int main(int argc, char **argv, char **envp) > exit(1); > } > #else > - error_report("-sandbox support is not enabled " > - "in this QEMU binary"); > - exit(1); > + if (!g_str_equal(optarg, "off")) { > + error_report("-sandbox support is not enabled " > + "in this QEMU binary"); > + exit(1); > + } '-sandbox off' is just syntax sugar for '-sandbox enable=off', with the default arg name handled by QemuOpts. If we want to keep ability to run "-sandbox off" we should do it via the QEMU opts code we already have in the first part of the conditional, so that "-sandbox enable=off" also works as normal. Essentially we need to push the #ifdef CONFIG_SECCOMP down into the parse_sandbox method, so that it parses the "enable" option normally but rejects any value except disabled.. The QemuOptsList should also be conditional to only register the "enable" arg and not the other bits. Regards, Daniel
On 2/27/19 5:01 AM, Daniel P. Berrangé wrote: > On Wed, Feb 27, 2019 at 12:21:32PM +1100, David Gibson wrote: >> At present, when seccomp support is compiled out with --disable-seccomp >> we fail with an error if the user puts -sandbox on the command line. >> >> That kind of makes sense, but it's a bit strange that we reject a request >> to disable sandboxing with "-sandbox off" saying we don't support >> sandboxing. >> >> This puts in a small sandbox to (correctly) silently ignore -sandbox off >> when we don't have sandboxing support compiled in. This makes life easier >> for testcases, since they can safely specify "-sandbox off" without having >> to care if the qemu they're using is compiled with sandbox support or not. >> >> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > '-sandbox off' is just syntax sugar for '-sandbox enable=off', with > the default arg name handled by QemuOpts. Except that libvirt probes, via query-command-line-options, whether the '-sandbox' option supports the 'enable' key. You risk breaking introspection (where libvirt knows NOT to use enable=on|off) if -sandbox enable=off is advertised even when the feature is not compiled in. > > If we want to keep ability to run "-sandbox off" we should do it via > the QEMU opts code we already have in the first part of the conditional, > so that "-sandbox enable=off" also works as normal. > > Essentially we need to push the #ifdef CONFIG_SECCOMP down into the > parse_sandbox method, so that it parses the "enable" option normally > but rejects any value except disabled.. > > The QemuOptsList should also be conditional to only register the > "enable" arg and not the other bits. Whatever we do here had better be careful that the introspection used by libvirt doesn't break, when libvirt is trying to learn when seccomp was not compiled in.
On Wed, Feb 27, 2019 at 07:59:11AM -0600, Eric Blake wrote: > On 2/27/19 5:01 AM, Daniel P. Berrangé wrote: > > On Wed, Feb 27, 2019 at 12:21:32PM +1100, David Gibson wrote: > >> At present, when seccomp support is compiled out with --disable-seccomp > >> we fail with an error if the user puts -sandbox on the command line. > >> > >> That kind of makes sense, but it's a bit strange that we reject a request > >> to disable sandboxing with "-sandbox off" saying we don't support > >> sandboxing. > >> > >> This puts in a small sandbox to (correctly) silently ignore -sandbox off > >> when we don't have sandboxing support compiled in. This makes life easier > >> for testcases, since they can safely specify "-sandbox off" without having > >> to care if the qemu they're using is compiled with sandbox support or not. > >> > >> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > > > '-sandbox off' is just syntax sugar for '-sandbox enable=off', with > > the default arg name handled by QemuOpts. > > Except that libvirt probes, via query-command-line-options, whether the > '-sandbox' option supports the 'enable' key. You risk breaking > introspection (where libvirt knows NOT to use enable=on|off) if -sandbox > enable=off is advertised even when the feature is not compiled in. It is even more complex than that. Libvirt looks for "elevateprivileges" option to decide to enable the sandbox. It only looks for "enable" when libvirt is configured to disable the sandbox, at which point is sets "-sandbox off". So I don't think my suggestion should break it. I do hate the idea of QEMU tailoring its CLI handling to suit the current specific impl of one client app though. If anything I'd suggest we should completely disable any parsing of -sandbox when seccomp is disabled, rather than leaving getopt to parse -sandbox and then raise an error. > > > > > If we want to keep ability to run "-sandbox off" we should do it via > > the QEMU opts code we already have in the first part of the conditional, > > so that "-sandbox enable=off" also works as normal. > > > > Essentially we need to push the #ifdef CONFIG_SECCOMP down into the > > parse_sandbox method, so that it parses the "enable" option normally > > but rejects any value except disabled.. > > > > The QemuOptsList should also be conditional to only register the > > "enable" arg and not the other bits. > > Whatever we do here had better be careful that the introspection used by > libvirt doesn't break, when libvirt is trying to learn when seccomp was > not compiled in. Regards, Daniel
Daniel P. Berrangé <berrange@redhat.com> writes: > On Wed, Feb 27, 2019 at 07:59:11AM -0600, Eric Blake wrote: >> On 2/27/19 5:01 AM, Daniel P. Berrangé wrote: >> > On Wed, Feb 27, 2019 at 12:21:32PM +1100, David Gibson wrote: >> >> At present, when seccomp support is compiled out with --disable-seccomp >> >> we fail with an error if the user puts -sandbox on the command line. >> >> >> >> That kind of makes sense, but it's a bit strange that we reject a request >> >> to disable sandboxing with "-sandbox off" saying we don't support >> >> sandboxing. >> >> >> >> This puts in a small sandbox to (correctly) silently ignore -sandbox off >> >> when we don't have sandboxing support compiled in. This makes life easier >> >> for testcases, since they can safely specify "-sandbox off" without having >> >> to care if the qemu they're using is compiled with sandbox support or not. I can't see such test cases. Can you give specific examples? >> >> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> >> >> > '-sandbox off' is just syntax sugar for '-sandbox enable=off', with >> > the default arg name handled by QemuOpts. >> >> Except that libvirt probes, via query-command-line-options, whether the >> '-sandbox' option supports the 'enable' key. You risk breaking >> introspection (where libvirt knows NOT to use enable=on|off) if -sandbox >> enable=off is advertised even when the feature is not compiled in. > > It is even more complex than that. Libvirt looks for "elevateprivileges" > option to decide to enable the sandbox. It only looks for "enable" when > libvirt is configured to disable the sandbox, at which point is sets > "-sandbox off". So I don't think my suggestion should break it. > > I do hate the idea of QEMU tailoring its CLI handling to suit the > current specific impl of one client app though. > > If anything I'd suggest we should completely disable any parsing > of -sandbox when seccomp is disabled, rather than leaving getopt > to parse -sandbox and then raise an error. I'm confused. Are you proposing to silently ignore -sandbox OPTARG regardless of OPTARG when CONFIG_SECCOMP is off? If yes, I object. If a user asks for a sandbox, and we can't give him one, we should at least tell him as much. >> > If we want to keep ability to run "-sandbox off" we should do it via >> > the QEMU opts code we already have in the first part of the conditional, >> > so that "-sandbox enable=off" also works as normal. >> > >> > Essentially we need to push the #ifdef CONFIG_SECCOMP down into the >> > parse_sandbox method, so that it parses the "enable" option normally >> > but rejects any value except disabled.. >> > >> > The QemuOptsList should also be conditional to only register the >> > "enable" arg and not the other bits. >> >> Whatever we do here had better be careful that the introspection used by >> libvirt doesn't break, when libvirt is trying to learn when seccomp was >> not compiled in. Currently, we have both #ifdef CONFIG_FOO case QEMU_OPTION_FOO: ... break; #endif and case QEMU_OPTION_FOO: #ifdef CONFIG_FOO ... break; #else error_report("FOO support is disabled"); exit(1); #endif The patch adds a third variant. We need fewer variants, not more. For what it's worth, conditional QMP commands do not exist when disabled, like the first variant above. In particular, introspection doesn't have them. Nicely obvious. QAPIfying the command line (yes, yes, overdue) should make it more like QMP. Wanting nicer errors than "unknown option / command" is legitimate. Wanting to accept "switch FOO off" even though FOO is disabled is also legitimate. Patches that provide such UI niceties while keeping introspection nicely obvious would be acceptable to me, provided they're not too complex. But they should be general, not a one-off.
On Wed, Feb 27, 2019 at 08:21:40PM +0100, Markus Armbruster wrote: > Daniel P. Berrangé <berrange@redhat.com> writes: > > > On Wed, Feb 27, 2019 at 07:59:11AM -0600, Eric Blake wrote: > >> On 2/27/19 5:01 AM, Daniel P. Berrangé wrote: > >> > On Wed, Feb 27, 2019 at 12:21:32PM +1100, David Gibson wrote: > >> >> At present, when seccomp support is compiled out with --disable-seccomp > >> >> we fail with an error if the user puts -sandbox on the command line. > >> >> > >> >> That kind of makes sense, but it's a bit strange that we reject a request > >> >> to disable sandboxing with "-sandbox off" saying we don't support > >> >> sandboxing. > >> >> > >> >> This puts in a small sandbox to (correctly) silently ignore -sandbox off > >> >> when we don't have sandboxing support compiled in. This makes life easier > >> >> for testcases, since they can safely specify "-sandbox off" without having > >> >> to care if the qemu they're using is compiled with sandbox support or not. > > I can't see such test cases. Can you give specific examples? > > >> >> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > >> > >> > '-sandbox off' is just syntax sugar for '-sandbox enable=off', with > >> > the default arg name handled by QemuOpts. > >> > >> Except that libvirt probes, via query-command-line-options, whether the > >> '-sandbox' option supports the 'enable' key. You risk breaking > >> introspection (where libvirt knows NOT to use enable=on|off) if -sandbox > >> enable=off is advertised even when the feature is not compiled in. > > > > It is even more complex than that. Libvirt looks for "elevateprivileges" > > option to decide to enable the sandbox. It only looks for "enable" when > > libvirt is configured to disable the sandbox, at which point is sets > > "-sandbox off". So I don't think my suggestion should break it. > > > > I do hate the idea of QEMU tailoring its CLI handling to suit the > > current specific impl of one client app though. > > > > If anything I'd suggest we should completely disable any parsing > > of -sandbox when seccomp is disabled, rather than leaving getopt > > to parse -sandbox and then raise an error. > > I'm confused. Are you proposing to silently ignore -sandbox OPTARG > regardless of OPTARG when CONFIG_SECCOMP is off? If yes, I object. If > a user asks for a sandbox, and we can't give him one, we should at least > tell him as much. No, i mean remove "case QEMU_OPTION_sandbox:" from the code, which will cause us to report '-sandbox' as an unsupported argument. > Currently, we have both > > #ifdef CONFIG_FOO > case QEMU_OPTION_FOO: > ... > break; > #endif This is what I was suggesting for -sandbox above. > > and > > > case QEMU_OPTION_FOO: > #ifdef CONFIG_FOO > ... > break; > #else > error_report("FOO support is disabled"); > exit(1); > #endif This is what -sandbox does currently. > > The patch adds a third variant. We need fewer variants, not more. > > For what it's worth, conditional QMP commands do not exist when > disabled, like the first variant above. In particular, introspection > doesn't have them. Nicely obvious. > > QAPIfying the command line (yes, yes, overdue) should make it more like > QMP. > > Wanting nicer errors than "unknown option / command" is legitimate. > > Wanting to accept "switch FOO off" even though FOO is disabled is also > legitimate. > > Patches that provide such UI niceties while keeping introspection nicely > obvious would be acceptable to me, provided they're not too complex. > But they should be general, not a one-off. Regards, Daniel
diff --git a/vl.c b/vl.c index 502857a176..9d5f1b7ebb 100644 --- a/vl.c +++ b/vl.c @@ -3857,9 +3857,11 @@ int main(int argc, char **argv, char **envp) exit(1); } #else - error_report("-sandbox support is not enabled " - "in this QEMU binary"); - exit(1); + if (!g_str_equal(optarg, "off")) { + error_report("-sandbox support is not enabled " + "in this QEMU binary"); + exit(1); + } #endif break; case QEMU_OPTION_add_fd:
At present, when seccomp support is compiled out with --disable-seccomp we fail with an error if the user puts -sandbox on the command line. That kind of makes sense, but it's a bit strange that we reject a request to disable sandboxing with "-sandbox off" saying we don't support sandboxing. This puts in a small sandbox to (correctly) silently ignore -sandbox off when we don't have sandboxing support compiled in. This makes life easier for testcases, since they can safely specify "-sandbox off" without having to care if the qemu they're using is compiled with sandbox support or not. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- vl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)