From nobody Tue Nov 18 21:12:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1612545537; cv=none; d=zohomail.com; s=zohoarc; b=Z5jem5Jgi4V7yhcd8jDSzI29PIyVq8+q3NNNWcavK8JLcmHU2gHqJ3Swx9F7eN2Q+uZD0q4JqWO0PzXbFnMZogrUUiGFITMM2+XIFbvuv08MytiidgQCGdmoxSSphnRdBi4V1Hp2MNYzsmbRAyjG7atpr8blzWwK1o6LUVBEqvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612545537; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=pSoQiepgpeuvlonviTFU0Pq0agocqriq1sbtJ5D1E5c=; b=I0gubXQk6H/ELoNkj9SjEDkoMqKKi+nfs290voTCoWGZvV0sIPWGu9uZGJCL3HlKEGuiTqQqmTUSbvpg+HkzRopStVcmw8WLRPPluK208LNNwi08wgpLBodkY5BfJkt6ZC6xXH84Wz3X701lFp8z/g8uyK5ZSnkN++D/MGbldXg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 16125455371951021.9653102406755; Fri, 5 Feb 2021 09:18:57 -0800 (PST) Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-Dy86i6xCMt-5REZw03uZSg-1; Fri, 05 Feb 2021 12:18:52 -0500 Received: by mail-ed1-f71.google.com with SMTP id w23so7223239edr.15 for ; Fri, 05 Feb 2021 09:18:52 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id e6sm4505496edv.46.2021.02.05.09.18.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 09:18:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612545536; 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=pSoQiepgpeuvlonviTFU0Pq0agocqriq1sbtJ5D1E5c=; b=grjtkKzNRR0WbKk4mHjwPemzv2O5d7Emfs6FlcsSOInC8eR1bL3BdxMiUUVK88j9mK/wbk jrlDAzzpVJV1wWdswnihBTbqbnPg6zQOPODaRDBmKJ9entAfQO2ud4iJTgFHRXLnClZYnu /ilBpUwTfU9T5w2KI3+oLdgGxM3QhjA= X-MC-Unique: Dy86i6xCMt-5REZw03uZSg-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=pSoQiepgpeuvlonviTFU0Pq0agocqriq1sbtJ5D1E5c=; b=CGr/o0FMnjZneXp1+GdtszfxSFu50oQcM5nsDyotTZT1Yjc2JCN3pDJW+sK3Hwy5as 8fpQAnrflpBtXhI1BdgxCO53toPDIZMH/rn3E2DEJhhb7kCBdGvwuPmlWLFWg8eN4XiV E8qYJ4NfGUUxdGjJmqfJuufpOgAwOedocb69bkHMQRLB1/ie98DgzqFET2JqO2mSkxSl 5YxfJo6n7ixM6HbRZ3rd7D+g6dbxgmzii+RIhGvLWUP/RzSUBKMfGGymOELzoZIM3AfN FuimUg3nG3lL4FYvlNipwHZWUY1Cm0NX7petJ/svFJkBGYaeqIsV7qD4VPdT4NtFHtkH 6Enw== X-Gm-Message-State: AOAM530bX1bQFrxWT9Z85gCAAQPdjzwhbw+3+T0FY8cA++RKWE7eJAu/ X4tFq0uNsztmNuacaoUrfEIBbk4QMZ7qheFiLem4tIMMicm5h6ShoXbatH9++MOxaSFjGtS/j2k NLayvSQpQS11PpQ== X-Received: by 2002:aa7:de14:: with SMTP id h20mr4486713edv.95.1612545531217; Fri, 05 Feb 2021 09:18:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwh+QfvHe5QteoXDA9vEoFKQsmWHqylEHxA4GYuiQmZNcT8dRgwtTGR0VtZWbf4UNi08KvRXQ== X-Received: by 2002:aa7:de14:: with SMTP id h20mr4486686edv.95.1612545531036; Fri, 05 Feb 2021 09:18:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Dr. David Alan Gilbert" , Max Reitz , Peter Maydell , Stefan Hajnoczi , Eduardo Otubo , qemu-block@nongnu.org, Gerd Hoffmann , Aurelien Jarno , Michael Roth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Alex Williamson , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH v2 5/8] seccomp: Replace the word 'blacklist' Date: Fri, 5 Feb 2021 18:18:14 +0100 Message-Id: <20210205171817.2108907-6-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210205171817.2108907-1-philmd@redhat.com> References: <20210205171817.2108907-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 Reviewed-by: Daniel P. Berrang=C3=A9 Acked-by: Eduardo Otubo Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e --- 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