From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VI1cM-0001U6-Hy for qemu-devel@nongnu.org; Fri, 06 Sep 2013 15:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VI1cB-0008MV-G1 for qemu-devel@nongnu.org; Fri, 06 Sep 2013 15:22:54 -0400 Received: from e24smtp01.br.ibm.com ([32.104.18.85]:51411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VI1cB-0008G3-3j for qemu-devel@nongnu.org; Fri, 06 Sep 2013 15:22:43 -0400 Received: from /spool/local by e24smtp01.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 6 Sep 2013 16:22:39 -0300 Received: from d24relay03.br.ibm.com (d24relay03.br.ibm.com [9.13.184.25]) by d24dlp01.br.ibm.com (Postfix) with ESMTP id 08C513520064 for ; Fri, 6 Sep 2013 15:22:38 -0400 (EDT) Received: from d24av04.br.ibm.com (d24av04.br.ibm.com [9.8.31.97]) by d24relay03.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r86JL7I441353460 for ; Fri, 6 Sep 2013 16:21:07 -0300 Received: from d24av04.br.ibm.com (localhost [127.0.0.1]) by d24av04.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r86JMbgF002345 for ; Fri, 6 Sep 2013 16:22:37 -0300 From: Eduardo Otubo Date: Fri, 6 Sep 2013 16:21:48 -0300 Message-Id: <1378495308-24560-4-git-send-email-otubo@linux.vnet.ibm.com> In-Reply-To: <1378495308-24560-1-git-send-email-otubo@linux.vnet.ibm.com> References: <1378495308-24560-1-git-send-email-otubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCHv3 3/3] seccomp: general fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pmoore@redhat.com, coreyb@linux.vnet.ibm.com, Eduardo Otubo 1) On qemu-seccomp.c:255, the variable ctx was being used uninitialized; now it's initialized with NULL and it's being checked at the end of the function. 2) Changed the name of the command line option from "enable" to "sandbox" for a better understanding from user side. Signed-off-by: Eduardo Otubo --- qemu-seccomp.c | 5 +++-- vl.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qemu-seccomp.c b/qemu-seccomp.c index 5e85eb5..f39d636 100644 --- a/qemu-seccomp.c +++ b/qemu-seccomp.c @@ -252,7 +252,7 @@ seccomp_return: int seccomp_start(int list_type) { int rc = 0; - scmp_filter_ctx ctx; + scmp_filter_ctx ctx = NULL; switch (list_type) { case WHITELIST: @@ -280,6 +280,7 @@ int seccomp_start(int list_type) rc = seccomp_load(ctx); seccomp_return: - seccomp_release(ctx); + if (!ctx) + seccomp_release(ctx); return rc; } diff --git a/vl.c b/vl.c index 909f685..129919d 100644 --- a/vl.c +++ b/vl.c @@ -323,11 +323,11 @@ static QemuOptsList qemu_rtc_opts = { static QemuOptsList qemu_sandbox_opts = { .name = "sandbox", - .implied_opt_name = "enable", + .implied_opt_name = "sandbox", .head = QTAILQ_HEAD_INITIALIZER(qemu_sandbox_opts.head), .desc = { { - .name = "enable", + .name = "sandbox", .type = QEMU_OPT_BOOL, },{ .name = "strict", @@ -1036,7 +1036,7 @@ static int parse_sandbox(QemuOpts *opts, void *opaque) { const char * strict_value = NULL; /* FIXME: change this to true for 1.3 */ - if (qemu_opt_get_bool(opts, "enable", false)) { + if (qemu_opt_get_bool(opts, "sandbox", false)) { #ifdef CONFIG_SECCOMP if (seccomp_start(WHITELIST) < 0) { qerror_report(ERROR_CLASS_GENERIC_ERROR, -- 1.8.3.1