From nobody Sun May 5 11:06:22 2024 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=1600176791; cv=none; d=zohomail.com; s=zohoarc; b=BrbxXgTW4c58i87aQurDx5R9uyE6+az10pN7wDzENKqWNz84ARuvWmwS9z/jHRKIN0uxwtnP6NfKk0BiwtuHyb/uV1GeTPckyK78714UZmACTxRa5kk7UGW4Gm3n0sgsqe1RZzBwx0ABBfEHBERvIXwK9eeGIhUNiaB9H7R5vbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600176791; 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=Jja0yAzXrMO1VzbeS7S7TWsqOyTmFI/DHOMiN1efKZ8=; b=mAtVNCjmdZ9GmLHBU6C5OW+DPmGdavctn9vNkgjtW+FyUrgdKuiilDqiKCd965sCXPz9xVFDfK9RFsKyPOfogg1YOBdJRBxNqaO7DiPcP40E4H92byToKWB5A2JVCWV+jVPfsXxI07vBOz7UakbTua+kfLo2Ahr+BdqMb8hl5Fs= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600176790997292.2527701763654; Tue, 15 Sep 2020 06:33:10 -0700 (PDT) Received: from localhost ([::1]:47810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIB53-0007YG-Eh for importer@patchew.org; Tue, 15 Sep 2020 09:33:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kI8jB-0005MM-Qh for qemu-devel@nongnu.org; Tue, 15 Sep 2020 07:02:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:44135 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kI8j8-0006eO-GG for qemu-devel@nongnu.org; Tue, 15 Sep 2020 07:02:25 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-562-h0n_UnTrNYSWE8-hDKUYdA-1; Tue, 15 Sep 2020 07:02:17 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4BE2E64086; Tue, 15 Sep 2020 11:02:16 +0000 (UTC) Received: from genji.redhat.com (ovpn-115-97.ams2.redhat.com [10.36.115.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59C0C60E1C; Tue, 15 Sep 2020 11:02:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600167741; 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=Jja0yAzXrMO1VzbeS7S7TWsqOyTmFI/DHOMiN1efKZ8=; b=T8PXZ7BejGO4E4XH6qz1TKfl3vcS/3YFN6IiFcFkC5UJvQiK7H2zLQ1Ls71GHOQpKSnvJB GYO6z741kKE9v7snHfIqgKjHCsnGdk6jDnaxcMpP89TAHRF3JwsKv4hDLat5S4YBk99ioA DHZBD/fBGsoT2E6gb1xRxcj0imEvaxk= X-MC-Unique: h0n_UnTrNYSWE8-hDKUYdA-1 From: Eduardo Otubo To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [PULL 1/1] seccomp: fix killing of whole process instead of thread Date: Tue, 15 Sep 2020 13:01:55 +0200 Message-Id: <20200915110155.15362-2-otubo@redhat.com> In-Reply-To: <20200915110155.15362-1-otubo@redhat.com> References: <20200915110155.15362-1-otubo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=otubo@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=205.139.110.120; envelope-from=otubo@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/15 02:11:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -38 X-Spam_score: -3.9 X-Spam_bar: --- X-Spam_report: (-3.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.792, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 15 Sep 2020 09:15:38 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Daniel P. Berrang=C3=A9 Back in 2018 we introduced support for killing the whole QEMU process instead of just one thread, when a seccomp rule is violated: commit bda08a5764d470f101fa38635d30b41179a313e1 Author: Marc-Andr=C3=A9 Lureau Date: Wed Aug 22 19:02:48 2018 +0200 seccomp: prefer SCMP_ACT_KILL_PROCESS if available Fast forward a year and we introduced a patch to avoid killing the process for resource control syscalls tickled by Mesa. commit 9a1565a03b79d80b236bc7cc2dbce52a2ef3a1b8 Author: Daniel P. Berrang=C3=A9 Date: Wed Mar 13 09:49:03 2019 +0000 seccomp: don't kill process for resource control syscalls Unfortunately a logic bug effectively reverted the first commit mentioned so that we go back to only killing the thread, not the whole process. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Stefan Hajnoczi Acked-by: Eduardo Otubo --- qemu-seccomp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qemu-seccomp.c b/qemu-seccomp.c index e0a1829b3d..8325ecb766 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -136,8 +136,9 @@ static uint32_t qemu_seccomp_get_action(int set) =20 if (qemu_seccomp(SECCOMP_GET_ACTION_AVAIL, 0, &action) =3D=3D = 0) { kill_process =3D 1; + } else { + kill_process =3D 0; } - kill_process =3D 0; } if (kill_process =3D=3D 1) { return SCMP_ACT_KILL_PROCESS; --=20 2.18.1