From patchwork Mon Sep 28 23:53:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 54213 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by patches.linaro.org (Postfix) with ESMTPS id 40D7622B1E for ; Mon, 28 Sep 2015 23:56:45 +0000 (UTC) Received: by wicuu12 with SMTP id uu12sf47086066wic.2 for ; Mon, 28 Sep 2015 16:56:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=hmX7gnlUuVBst2QBxLhB/QpaXKKxzSVZsmiFnxcsgxE=; b=BggvD5r3Gd+8+3BtRmwfElfngr9U2ZsYxVIhfJNyHtxqDIYb5UOf/HSdkUJBVzEVEj vDEG4C+Zt91+W2OjxXgNlpvugESmo3mY7b1GFykjv3VzTf/dYVjgCPb6n76Ei6yB98FN bbxIzEeB05EiTecITff693zmar3YdI/fja0/1sawyQMn3N8pm9jCG1Vv5J7NWnle4sio GwJUHV8PF2+4Fcciwbfiubyh5UHmRpX3bxz3gggFjkSrAjZPGuooYxZLMEBzzA9QSZOz prUKxHIKhZteNXBHhABA7cCaqFXJZji9ZelkqPEHwAXt81d9cKYxTaDx5zTsxL+Q4Fwl 0aVA== X-Gm-Message-State: ALoCoQkoCMRTcsXZt2UliT0DdqATlWX383mOWYoMJNgOXlYOknxyh1qPkrvGJzDps4OJ1ruhH64f X-Received: by 10.112.142.195 with SMTP id ry3mr2064865lbb.22.1443484604518; Mon, 28 Sep 2015 16:56:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.181.101 with SMTP id dv5ls271553lac.94.gmail; Mon, 28 Sep 2015 16:56:44 -0700 (PDT) X-Received: by 10.152.5.194 with SMTP id u2mr6278719lau.42.1443484604365; Mon, 28 Sep 2015 16:56:44 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id tq7si9525041lbb.20.2015.09.28.16.56.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Sep 2015 16:56:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lahh2 with SMTP id h2so178202668lah.0 for ; Mon, 28 Sep 2015 16:56:43 -0700 (PDT) X-Received: by 10.112.199.137 with SMTP id jk9mr6403041lbc.86.1443484603702; Mon, 28 Sep 2015 16:56:43 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1826279lbq; Mon, 28 Sep 2015 16:56:42 -0700 (PDT) X-Received: by 10.31.0.215 with SMTP id 206mr14316862vka.105.1443484602542; Mon, 28 Sep 2015 16:56:42 -0700 (PDT) Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com. [209.132.183.37]) by mx.google.com with ESMTPS id g131si11422976vkf.162.2015.09.28.16.56.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Sep 2015 16:56:42 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.37 as permitted sender) client-ip=209.132.183.37; Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8SNrlYF003926; Mon, 28 Sep 2015 19:53:49 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id t8SNrk8C004576 for ; Mon, 28 Sep 2015 19:53:46 -0400 Received: from colepc.redhat.com (ovpn-113-60.phx2.redhat.com [10.3.113.60]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8SNrjik029550; Mon, 28 Sep 2015 19:53:45 -0400 From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 28 Sep 2015 19:53:42 -0400 Message-Id: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] qemu: Fix dynamic_ownership qemu.conf setting X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: crobinso@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Commit 307fb904 (Sep 10) added a 'privileged' variable when creating the DAC driver: @@ -153,6 +157,7 @@ virSecurityManagerNewDAC(const char *virtDriver, bool defaultConfined, bool requireConfined, bool dynamicOwnership, + bool privileged, virSecurityManagerDACChownCallback chownCallback) But argument order is mixed up at the caller, swapping dynamicOwnership and privileged values. This corrects the argument order https://bugzilla.redhat.com/show_bug.cgi?id=1266628 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7025c51..aff1915 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -431,8 +431,8 @@ qemuSecurityInit(virQEMUDriverPtr driver) cfg->allowDiskFormatProbing, cfg->securityDefaultConfined, cfg->securityRequireConfined, - virQEMUDriverIsPrivileged(driver), cfg->dynamicOwnership, + virQEMUDriverIsPrivileged(driver), qemuSecurityChownCallback))) goto error; if (!stack) {