[libvirt] [PATCH 2/5] util: allow using virCommandAllowCap with setuid helpers

[Paolo Bonzini]

When running unprivileged, virSetUIDGIDWithCaps will fail because it
tries to add the requested capabilities to the permitted and effective
sets.

Detect this case, and invoke the child with cleared permitted and
effective sets.  If it is a setuid program, it will get them.

Some care is needed also because you cannot drop capabilities from the
bounding set without CAP_SETPCAP.  Because of that, ignore errors from
setting the bounding set.

Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---
 src/util/virutil.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 36e6cee..8104e89 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -3052,9 +3052,21 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, unsigned long long capBits,
 
     /* Change to the temp capabilities */
     if ((capng_ret = capng_apply(CAPNG_SELECT_CAPS)) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("cannot apply process capabilities %d"), capng_ret);
-        goto cleanup;
+        /* Failed.  If we are running unprivileged, and the arguments make sense
+         * for this scenario, assume we're starting some kind of setuid helper:
+         * do not set any of capBits in the permitted or effective sets, and let
+         * the program get them on its own.
+         *
+         * (Too bad we cannot restrict the bounding set to the capabilities we
+         * would like the helper to have!).
+         */
+        if (getuid() > 0 && clearExistingCaps && !need_setuid && !need_setgid) {
+            capng_clear(CAPNG_SELECT_CAPS);
+        } else {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot apply process capabilities %d"), capng_ret);
+            goto cleanup;
+        }
     }
 
     if (virSetUIDGID(uid, gid) < 0)
-- 
1.8.1.4