From nobody Wed Feb 11 06:49:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695977542; cv=none; d=zohomail.com; s=zohoarc; b=URtlbCfwCqQQkc/TsQevaAo1UqLMWhlvBcimdrUJIV7T9sRz2HFj3g+oHuZzdwSHUi40NJ4lgDX1lE4qfsINWCM7b6QsXLEFF7ACGIscO3ITvz8y19D4wz2c1Uz91kqUvt5/KlibeO8l5H9RiKWjPfskuM+EjfDG7sqW9i0N9xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695977542; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5OSnQuURtOEaWDZzPXgID5euxSqDLR06RTAy/I5xWro=; b=hg3uaBpl7cB72u0kkWwI+AsjfqihTqxlyGlsjnVBhv5R20x4o2BSdTxXHCSfW03Rs5DjeYjl4QPB0H/nmXFOZH8IrxoLD7t9huyd9YBAuIIRtNC+bEa6fYwaZP5dJpkwwGWrEAQgmENdTvIOamCnMjKLwB6tMWVGSCUIV+t502w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695977542165202.94246190922445; Fri, 29 Sep 2023 01:52:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qm9DU-00050q-0P; Fri, 29 Sep 2023 04:51:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9DN-0004xt-E5 for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qm9DA-0005bv-Ph for qemu-devel@nongnu.org; Fri, 29 Sep 2023 04:51:11 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-163-Z0a2Tsd5NtKGD3QgQRxF_Q-1; Fri, 29 Sep 2023 04:50:58 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 03E548030A9 for ; Fri, 29 Sep 2023 08:50:58 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB0E714171CA for ; Fri, 29 Sep 2023 08:50:57 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E2CC121E68A6; Fri, 29 Sep 2023 10:50:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695977460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5OSnQuURtOEaWDZzPXgID5euxSqDLR06RTAy/I5xWro=; b=cd23FgNveUtco/KFCx8Qy+aUgZiu2mmdgb+/+m3OQ9mwHD04xVoFzVigg8TjSo2ggG3uGL DZoApKu03HQ6FkfcsSiDO0RbO3FQRW6Sf69ElomgeoGpXU/oVfPNMH/1JnFInMs8xf/V7m SC8dX0MW56LLDg78XxcsPwAMdVbZnQU= X-MC-Unique: Z0a2Tsd5NtKGD3QgQRxF_Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PULL 49/56] seccomp: avoid shadowing of 'action' variable Date: Fri, 29 Sep 2023 10:50:46 +0200 Message-ID: <20230929085053.2789105-50-armbru@redhat.com> In-Reply-To: <20230929085053.2789105-1-armbru@redhat.com> References: <20230929085053.2789105-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695977544111100003 From: Daniel P. Berrang=C3=A9 This is confusing as one 'action' variable is used for storing a SCMP_ enum value, while the other 'action' variable is used for storing a SECCOMP_ enum value. Signed-off-by: Daniel P. Berrang=C3=A9 Message-ID: <20230922160644.438631-3-berrange@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- softmmu/qemu-seccomp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c index d66a2a1226..4d7439e7f7 100644 --- a/softmmu/qemu-seccomp.c +++ b/softmmu/qemu-seccomp.c @@ -283,9 +283,9 @@ static uint32_t qemu_seccomp_update_action(uint32_t act= ion) if (action =3D=3D SCMP_ACT_TRAP) { static int kill_process =3D -1; if (kill_process =3D=3D -1) { - uint32_t action =3D SECCOMP_RET_KILL_PROCESS; + uint32_t testaction =3D SECCOMP_RET_KILL_PROCESS; =20 - if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &action) =3D=3D = 0) { + if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &testaction) =3D= =3D 0) { kill_process =3D 1; } else { kill_process =3D 0; --=20 2.41.0