From nobody Fri Apr 26 13:59:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553681107145314.4630248614527; Wed, 27 Mar 2019 03:05:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:44887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h95QZ-0006Pd-Qd for importer@patchew.org; Wed, 27 Mar 2019 06:04:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h95L6-0002oH-Ar for qemu-devel@nongnu.org; Wed, 27 Mar 2019 05:59:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h95L5-00046j-BR for qemu-devel@nongnu.org; Wed, 27 Mar 2019 05:59:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9610) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h95L5-00046M-3a for qemu-devel@nongnu.org; Wed, 27 Mar 2019 05:59:19 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70FF73078A2A; Wed, 27 Mar 2019 09:59:18 +0000 (UTC) Received: from vader.redhat.com (unknown [10.36.118.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3233898A6; Wed, 27 Mar 2019 09:59:13 +0000 (UTC) From: Eduardo Otubo To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2019 10:59:04 +0100 Message-Id: <20190327095904.18595-3-otubo@redhat.com> In-Reply-To: <20190327095904.18595-1-otubo@redhat.com> References: <20190327095904.18595-1-otubo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 27 Mar 2019 09:59:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] seccomp: report more useful errors from seccomp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Daniel P. Berrang=C3=A9 Most of the seccomp functions return errnos as a negative return value. The code is currently ignoring these and reporting a generic error message for all seccomp failure scenarios making debugging painful. Report a more precise error from each failed call and include errno if it is available. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Acked-by: Eduardo Otubo --- qemu-seccomp.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/qemu-seccomp.c b/qemu-seccomp.c index cf520883c7..e0a1829b3d 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -155,20 +155,22 @@ static uint32_t qemu_seccomp_get_action(int set) } =20 =20 -static int seccomp_start(uint32_t seccomp_opts) +static int seccomp_start(uint32_t seccomp_opts, Error **errp) { - int rc =3D 0; + int rc =3D -1; unsigned int i =3D 0; scmp_filter_ctx ctx; =20 ctx =3D seccomp_init(SCMP_ACT_ALLOW); if (ctx =3D=3D NULL) { - rc =3D -1; + error_setg(errp, "failed to initialize seccomp context"); goto seccomp_return; } =20 rc =3D seccomp_attr_set(ctx, SCMP_FLTATR_CTL_TSYNC, 1); if (rc !=3D 0) { + error_setg_errno(errp, -rc, + "failed to set seccomp thread synchronization"); goto seccomp_return; } =20 @@ -182,15 +184,21 @@ static int seccomp_start(uint32_t seccomp_opts) rc =3D seccomp_rule_add_array(ctx, action, blacklist[i].num, blacklist[i].narg, blacklist[i].arg_cm= p); if (rc < 0) { + error_setg_errno(errp, -rc, + "failed to add seccomp blacklist rules"); goto seccomp_return; } } =20 rc =3D seccomp_load(ctx); + if (rc < 0) { + error_setg_errno(errp, -rc, + "failed to load seccomp syscall filter in kernel"= ); + } =20 seccomp_return: seccomp_release(ctx); - return rc; + return rc < 0 ? -1 : 0; } =20 #ifdef CONFIG_SECCOMP @@ -260,9 +268,7 @@ int parse_sandbox(void *opaque, QemuOpts *opts, Error *= *errp) } } =20 - if (seccomp_start(seccomp_opts) < 0) { - error_setg(errp, "failed to install seccomp syscall filter " - "in the kernel"); + if (seccomp_start(seccomp_opts, errp) < 0) { return -1; } } --=20 2.17.2