]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
virSetUIDGIDWithCaps: Drop redundant parenthesis around capng_apply()
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 22 Jul 2021 12:12:14 +0000 (14:12 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Mon, 26 Jul 2021 07:53:09 +0000 (09:53 +0200)
After all capabilities were set (except for CAP_SETGID,
CAP_SETUID and CAP_SETPCAP) and after UID:GID was changed we drop
the last aforementioned capabilities (we couldn't drop them
before because we needed UID:GID and capabilities change).
Therefore, there's final capng_apply() call. However, it is
wrapped in one layer of parenthesis more than needed.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/util/virutil.c

index ed3d57662b2f754e09f4539c5902592a252c398c..aba0aea0ff5819115c7bc7a6e6347221e3ccde4d 100644 (file)
@@ -1261,7 +1261,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups,
     if (need_setpcap)
         capng_update(CAPNG_DROP, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SETPCAP);
 
-    if (((capng_ret = capng_apply(CAPNG_SELECT_CAPS)) < 0)) {
+    if ((capng_ret = capng_apply(CAPNG_SELECT_CAPS)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("cannot apply process capabilities %d"), capng_ret);
         return -1;