From nobody Tue Nov 18 19:43:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612299570; cv=none; d=zohomail.com; s=zohoarc; b=KOwpGJ7DdfvN1wezS3xZn9EWToGcQ+998G7+Ra7lcMLzU6BM1blYZ2FKoPPz1hG0KDjZvjAmyB3uOjKVwRCS1x0EE/mGThM977+eOCXhUSMCUFGzWpv5DrZAH+RvuOlR+hWGWHFYO/I7qM+xdwKgKYONPVMv/8Yu9i4BjxFZmAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612299570; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=2uRkOC0iQiO30r3cMD7qB5pIME7EIhrWLL7nKiab9bA=; b=GEcSso8OPjadKCP157Y9TNBDPru932lmEa4z+3u1kroVwdKjduAh/YDCx2VhyZAM7d2oYPglYtLeOO9Ylt3kapKn6iJSkbayKlw64NL7J9Yd7QAFKNUCFao5jpu6/WV+04UnPJ3idBH1AuJYcRzNCOLPCbxi8tQZMQmS76l7rn4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612299570243531.2248004291886; Tue, 2 Feb 2021 12:59:30 -0800 (PST) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-60-bIILvKE2MCiWHJZz_EpVXw-1; Tue, 02 Feb 2021 15:59:26 -0500 Received: by mail-ej1-f72.google.com with SMTP id ce9so1258602ejc.17 for ; Tue, 02 Feb 2021 12:59:26 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id w8sm9530415edd.39.2021.02.02.12.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 12:59:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612299568; 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=2uRkOC0iQiO30r3cMD7qB5pIME7EIhrWLL7nKiab9bA=; b=cp3z2b665sSHswirYOGDPMDQZAT/7ROPWNz98E2pZxgJA9PV06bGL7NdAqQt4n9an6Dqvr nIkjMmrsoQd2Qbqnv8k+eYAQwIeK35T1DXMeO+BosvDkhRoAnH2YdYYoIxPkBPmBj1kCRq brbtMW80fp7LS8wTLLmGds4CMmiM8sw= X-MC-Unique: bIILvKE2MCiWHJZz_EpVXw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2uRkOC0iQiO30r3cMD7qB5pIME7EIhrWLL7nKiab9bA=; b=SeE0SVFAYnvp7sRWOoJPUQZz/IaOdlSho/Y806xy7cF+UFnHBlCFsGmuvGo9UcA/Je ZLz7eHjTo9pVA8lU0oGIlDyu99DIwd0QYZDo6+bTYoZoA1Kw7usffRUJqTbHzQhYAqJh /memHcvXnW3Xt+K6ic5xJgcw39nz1QdbNiYbfe8zSR1Qvs+3kPAiaivt7Ouun1VXoAn8 7OcGMJcjz2pb5FL4GQmr9MbvIvIPQxw1mZVUYc2Cy5aOgimDDSodYYviyUW+3Hee6HEN c9AIhyqp2kKmp0QjukrQQ6LYs0pSNX93T6Bbkx5sPm/9VS+BKl7AXZfVQPgPev/HkZPp B/zQ== X-Gm-Message-State: AOAM530zd4OFRLiDjtifT3gI63MhVeT1MxzCtbML/+PnLpbsYsaVCTgQ yN4Y57T+HQWyBfGUo5kS91QEmDuOg4PvhUXIvA8en8s2sK/B+g/Aru3Ce7V2F+uj8l5jf1GVoNd JvaCGnANNdjmcBA== X-Received: by 2002:a50:acc1:: with SMTP id x59mr723552edc.43.1612299565578; Tue, 02 Feb 2021 12:59:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV+hZ1g/jXNPyKi8KquZsEFJD/96hNNdP2T4tm5/D31fwggm44iPA6t+qfzwPYGDl0woV3jQ== X-Received: by 2002:a50:acc1:: with SMTP id x59mr723536edc.43.1612299565447; Tue, 02 Feb 2021 12:59:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Dr. David Alan Gilbert" , Eduardo Otubo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , Aurelien Jarno , qemu-block@nongnu.org, Kevin Wolf , Michael Roth , Peter Maydell , Alex Williamson , Max Reitz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/12] seccomp: Replace the word 'blacklist' Date: Tue, 2 Feb 2021 21:58:20 +0100 Message-Id: <20210202205824.1085853-9-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com> References: <20210202205824.1085853-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the word "blacklist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Eduardo Otubo Reviewed-by: Daniel P. Berrang=C3=A9 --- softmmu/qemu-seccomp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c index 377ef6937ca..4c684bc9e71 100644 --- a/softmmu/qemu-seccomp.c +++ b/softmmu/qemu-seccomp.c @@ -45,8 +45,8 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] =3D { { .arg =3D 1, .op =3D SCMP_CMP_NE, .datum_a =3D SCHED_IDLE } }; =20 -static const struct QemuSeccompSyscall blacklist[] =3D { - /* default set of syscalls to blacklist */ +static const struct QemuSeccompSyscall denylist[] =3D { + /* default set of syscalls to denylist */ { SCMP_SYS(reboot), QEMU_SECCOMP_SET_DEFAULT }, { SCMP_SYS(swapon), QEMU_SECCOMP_SET_DEFAULT }, { SCMP_SYS(swapoff), QEMU_SECCOMP_SET_DEFAULT }, @@ -175,18 +175,18 @@ static int seccomp_start(uint32_t seccomp_opts, Error= **errp) goto seccomp_return; } =20 - for (i =3D 0; i < ARRAY_SIZE(blacklist); i++) { + for (i =3D 0; i < ARRAY_SIZE(denylist); i++) { uint32_t action; - if (!(seccomp_opts & blacklist[i].set)) { + if (!(seccomp_opts & denylist[i].set)) { continue; } =20 - action =3D qemu_seccomp_get_action(blacklist[i].set); - rc =3D seccomp_rule_add_array(ctx, action, blacklist[i].num, - blacklist[i].narg, blacklist[i].arg_cm= p); + action =3D qemu_seccomp_get_action(denylist[i].set); + rc =3D seccomp_rule_add_array(ctx, action, denylist[i].num, + denylist[i].narg, denylist[i].arg_cmp); if (rc < 0) { error_setg_errno(errp, -rc, - "failed to add seccomp blacklist rules"); + "failed to add seccomp denylist rules"); goto seccomp_return; } } --=20 2.26.2