From patchwork Mon Jan 22 17:51:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 864327 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="rbn95g99"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GNM5+DqV"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQJsK4qgxz9s7n for ; Tue, 23 Jan 2018 04:51:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=h9ioCFfXf2MrM4Tp5SzwfTpAJwOUKAqYCGv6m8Y3Fxg=; b=rbn95g99f4ROQ7 07vomkkHpkCbWxm4SHYmOBCuAe2QzNRjdD8vuR4qfAZXs6SkjfMacwxCSXDQEkrZ7+IDnFYpAS/iU YWEDxsHFwxTSXY8/mN1KwSXJiHafN/Qb99fOfVUX8zUr1+iKpJ/ga1r2HIjhqRAJbDd6GOaDo3ZO5 EOdTYQthx9AMGkNNwGs34jd5+VGhVMB9RjT8KW6fML646gGRN7wQbv55QQDHW9P0H5Um4TlMyLsks a24+d3s8TGNEp9FxEdfeUA5t8ojc/0iRIPx/j65hUBnq1EUF0s9ySa0x0WBbuLU5dfrxXaGJRX1YD mAOTHCD+BU8iAwajuYPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1edgG1-0005oL-SG; Mon, 22 Jan 2018 17:51:45 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1edgFy-0005X3-MC for lede-dev@lists.infradead.org; Mon, 22 Jan 2018 17:51:44 +0000 Received: by mail-wm0-x241.google.com with SMTP id v123so18521681wmd.5 for ; Mon, 22 Jan 2018 09:51:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rgXAN5YfeYOUQfJ1fheRR0H5JbzJFsB8G1RGMGpBioM=; b=GNM5+DqVDinLu22hqQNgTdECRi/sLhM0nesKJdbMbzGZBlAcvXybXik0u24lpoT4Qt bSyNkEm1RLZCCOwwQTbAv2/lSFXawN9H8wX+BxZGbyP01Pt5RbwUQBnxI503y5v/+CY/ aFkB5ExaYI44GZjpyVOsmBhOHTTCOulo+FRLzSq9NVt9pWvVQkZviBQbhUMuij4XY4Re wAFZtvMx64kD/G5NgtMcGuIJV66OLSNHuVhWkSNsmfzehTwlr/EtambdJpZtdbEgN/mj R/XU3Swa2r+dctgjM/6ZcL0tyhgk5F0aTGlLcTpWSFSBfuapwgAYE6iEV6fdMvQPrURN NnsA== 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; bh=rgXAN5YfeYOUQfJ1fheRR0H5JbzJFsB8G1RGMGpBioM=; b=peplqxalnZZpMca3kBjbRwGpXvH2qdmfpV2XR4DhqHfcJY7CHvbZGfKPd6hqZcxOgl C2/xjv/1YHXVsaslTH3BwguedLnyvqjn8e92ri2TVE+CPhT98gal3als5wLwMBU9rycu uww7DCPgTy76IZz/vc/potuTNbSMG0DE1FTQ/mJ+365BVzsajBSRmvqnIstpoAwHd6OG O6ZPOqJeRFziXDZGMqWOyT6nDcT3U44hJRRGA0myLEGxBQMwb4hT83ZAwcolagf1ahBX nyAWQbKRm97I2CCmXnLW2zIMEUg5DkiUKfhX7Jphfo17IwBrqRnBHpgq1cAS5ejBQeSn 0foQ== X-Gm-Message-State: AKwxyteKiyxUR4OZIMOrdQyr5KPkaBau4xyto+/Rk16sXk4upHR7gjXo e1a2sDbF9XM3iRHXFMDFol2d5w== X-Google-Smtp-Source: AH8x224hc11niMTyrx7nRGbRL8nryXF6BSEbU7A6kQbHGZXYyl5jOVHbdVQOLJ+G7bVd4NutVeqGcg== X-Received: by 10.28.7.68 with SMTP id 65mr5675792wmh.9.1516643490292; Mon, 22 Jan 2018 09:51:30 -0800 (PST) Received: from cplx43.eu.thmulti.com ([141.11.62.7]) by smtp.gmail.com with ESMTPSA id n53sm3965384wrb.56.2018.01.22.09.51.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jan 2018 09:51:29 -0800 (PST) From: Hans Dedecker To: lede-dev@lists.infradead.org, john@phrozen.org Date: Mon, 22 Jan 2018 18:51:22 +0100 Message-Id: <1516643483-1613-1-git-send-email-dedeckeh@gmail.com> X-Mailer: git-send-email 1.9.1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dedeckeh[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 1/2 procd] trace: add missing limits.h include X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Dedecker MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fixes compile issue when using glibc as INT_MAX is reported as undeclared. Signed-off-by: Hans Dedecker --- trace/trace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/trace/trace.c b/trace/trace.c index b156e2a..1c1e757 100644 --- a/trace/trace.c +++ b/trace/trace.c @@ -25,6 +25,7 @@ #include #include #include +#include #ifndef PTRACE_EVENT_STOP /* PTRACE_EVENT_STOP is defined in linux/ptrace.h, but this header From patchwork Mon Jan 22 17:51:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Dedecker X-Patchwork-Id: 864328 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JueCZA97"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="h5KT1/lN"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQJsW3gnrz9sRW for ; Tue, 23 Jan 2018 04:51:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kc52YE6fb+eVbIEU2GJjP/j3HieP2FsLi0TJPdFklxY=; b=JueCZA97/EliwU AULAAdoUVspj0Ux1HVtOzaSK2PAYTK2VBpP+5jHDm7IzZGgC12mpR0ZiwPVesmyrnAAPa52kSDEAG 6JA8gjsKX1rsLpRdh3OUJSdnr6Ev1kUm7XAG78mGGaEZV7VsoLfehCLzZtxK+v6Z3Mj9z7QCqzJXz jXp9BTdd/RfePAcvRxHwfc2AH8p9w3HxuBafNy53D7g5FqykoaGM2oobw6qKSdRBnwQAm0wyX+3ce dDX49Bc3kjmMcJbXLcreeDAMvuOaKwRMk8+z0dxkiLHAR7xBdVxlYXvmn0Y7pSHfoPLoZg7oTH3tU keHclXNSFBVchY+n9TnA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1edgGC-00061S-1J; Mon, 22 Jan 2018 17:51:56 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1edgG6-0005hO-1v for lede-dev@lists.infradead.org; Mon, 22 Jan 2018 17:51:54 +0000 Received: by mail-wm0-x242.google.com with SMTP id r78so18565191wme.0 for ; Mon, 22 Jan 2018 09:51:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9JRXQRk4/B/dAvEF6ElElU1+TRp7Z+EbWKnOxksZ8+I=; b=h5KT1/lNMMDrYyTlTY1QtO5k88kG2PjSxCkOfWMNEdUHmKCfftw4wirae8FupGUsVU VFGHsbDdoho8Ct4/l4L7m1yr2RLtM1Fhti4OIMQFW0fP0vLqrDoGm0pQ5w9msZxr9vbp nex58h8UcDuU8mUXZFzlWdjI4ImITYS1AuSlxQqMRDDlsVNUwyaO5Wb9tf9MU/istRwj EVjjJfwaR7dKsP9LOGwdIXihmc7kqI+/lnvzw6fmBWAcSwWTbzuFpQULqP4LpNpaTzmz FV9Kf7YaAu4QyUsf6lmmV7J5avaV1UhwPXfcNzVmaVbC7F3yvEgcRyCF5Mynfonr6sfI 0XAw== 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; bh=9JRXQRk4/B/dAvEF6ElElU1+TRp7Z+EbWKnOxksZ8+I=; b=fFtfnMgZhUUTCIC7hb2mWaFy43PHWS4wSzoHoPk3DMeanrgpuCeGhvxOvFhcZ8bCiv 0fUGBhdYw419Pfd0I6tjiCqp77ATfYyd6J3kYXbqNkViyjLWe9/jl6H5MCQka5oP695h l7DGG0kSgdj+efAxr2SnYMQw0KdjrhRspNV/GHE3MFwFkSfLy41zGZVAxH0JUkGafNpR eY4zSxDDCvGagyqxd42YhWfEf1HA3Fw05l69cyIZRmwSVulcOSgZbQHYaHBiMBP2MxUr EgLokU5VkO7KOzZcLe7aRtXK8Mof4Kkm1h7p1KjPDb5UglBsaOmFUoFFrAGL26GLiDQ6 db4g== X-Gm-Message-State: AKwxytc6caTrZ5Jl6YQ0hFiAI9iCnz8VjFUHkZnYgN5ECq6fgZzaILS1 mH/hStC567cXzh3E846gmqZKjw== X-Google-Smtp-Source: AH8x2274vEuwv1G5xZ761ec6jHCINyk/Ez4arR0l01I2p0ZTk3puU2it4o0GQvThEtC6ZCESJAIovg== X-Received: by 10.28.156.67 with SMTP id f64mr6349614wme.11.1516643497958; Mon, 22 Jan 2018 09:51:37 -0800 (PST) Received: from cplx43.eu.thmulti.com ([141.11.62.7]) by smtp.gmail.com with ESMTPSA id n53sm3965384wrb.56.2018.01.22.09.51.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jan 2018 09:51:37 -0800 (PST) From: Hans Dedecker To: lede-dev@lists.infradead.org, john@phrozen.org Date: Mon, 22 Jan 2018 18:51:23 +0100 Message-Id: <1516643483-1613-2-git-send-email-dedeckeh@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1516643483-1613-1-git-send-email-dedeckeh@gmail.com> References: <1516643483-1613-1-git-send-email-dedeckeh@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (dedeckeh[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 2/2 procd] trace: check asprintf() return value X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hans Dedecker MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Check asprintf() return value; fixes ignoring return value warnings: warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result [-Wunused-result] Signed-off-by: Hans Dedecker --- trace/trace.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/trace/trace.c b/trace/trace.c index 1c1e757..27cf108 100644 --- a/trace/trace.c +++ b/trace/trace.c @@ -317,13 +317,17 @@ int main(int argc, char **argv, char **envp) case SECCOMP_TRACE: preload = "/lib/libpreload-seccomp.so"; newenv = 2; - asprintf(&_envp[1], "SECCOMP_FILE=%s", json ? json : ""); + if (asprintf(&_envp[1], "SECCOMP_FILE=%s", json ? json : "") < 0) + ULOG_ERR("failed to allocate SECCOMP_FILE env: %m\n"); + kill(getpid(), SIGSTOP); break; } - asprintf(&_envp[0], "LD_PRELOAD=%s%s%s", preload, - old_preload ? ":" : "", - old_preload ? old_preload : ""); + if (asprintf(&_envp[0], "LD_PRELOAD=%s%s%s", preload, + old_preload ? ":" : "", + old_preload ? old_preload : "") < 0) + ULOG_ERR("failed to allocate LD_PRELOAD env: %m\n"); + memcpy(&_envp[newenv], envp, envc * sizeof(char *)); ret = execve(_argv[0], _argv, _envp); @@ -383,7 +387,8 @@ int main(int argc, char **argv, char **envp) case SECCOMP_TRACE: if (!violation_count) return 0; - asprintf(&json, "/tmp/%s.%u.violations.json", basename(*argv), child); + if (asprintf(&json, "/tmp/%s.%u.violations.json", basename(*argv), child) < 0) + ULOG_ERR("failed to allocate violations output path: %m\n"); break; } print_syscalls(policy, json);