From patchwork Tue Jan 23 20:30:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 865011 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="aWCTWx/f"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sVoy1Dlz"; 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 3zR0M34TMsz9s82 for ; Wed, 24 Jan 2018 07:31:27 +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=l+NxEZSkTMSwbF4Wbf88yoa2yCTdpuue16qXp5i3HhI=; b=aWCTWx/fVUrU5h TbGYaebixgsBftLyjl9/l6HfeHhxymeEYQ6VcWKUZTL0XyJErXt3kMuhf/FrBs4AFDyVVhnF0g/Ya lKPygPbSG4Sn+FgzamM8WD6t7dv6GzpIntSovHDTYr0pqI/RIUjkNBZk9m3HQbx4376gW3O+eT5Mi vvLYup0iLdcyA1Bt0ieiVOlwrRsikx0FgMhRtvDzsjMiXZvkog7WLAhGG8prgQ2FipAwUTKSmXhJG 3TTnqQPtSNg+OWIcoqybBpjI+g6Rx4jCGVGIQAi+/p0OxQFyF7Oz3gtwDs4EaUObEmNyY3Fc5w7N+ FGsDkRlNaV4KnaM0V5oA==; 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 1ee5E1-0004Ua-LB; Tue, 23 Jan 2018 20:31:21 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ee5Du-0004Td-GO for lede-dev@lists.infradead.org; Tue, 23 Jan 2018 20:31:17 +0000 Received: by mail-pg0-x243.google.com with SMTP id y27so1079118pgc.5 for ; Tue, 23 Jan 2018 12:31:03 -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=y28+n9839X9CmkxWVvPkHwV+AxK/fyNaOIa0O2LIly4=; b=sVoy1DlzoWXcZr765vKj+eTvuW3IDLf+fHsGS+QEIq9RpQIsWngSr4XbdCpzYbLVa9 684ZatiLuQodxHbQotheKFGlfm1NKdhhuOGxqOP8x0c4PnZQh/x07vcEdp5vZxutqQ04 l54NXItQf/WHtpk3Wuj2YUer0vppLQHRbJykyoQ2s2FwNz3TYnu/qn23RheufiThI2/T 6QvXjr0P03uniLYxcrVuAci9dlcq5eaBVz8rd+HulSk/02xXCCaTsWtsHeGQTvFj8iwT o+MC7SUtJnGel6xkSwXNe3Zivemm5w8Pa6pG4wRaCPCqwYjHLz9WznG8zBWsWOcUM25r SQHw== 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=y28+n9839X9CmkxWVvPkHwV+AxK/fyNaOIa0O2LIly4=; b=m6YwzL1R6h6Tbl6r68fic76qyxRAA5oKTx6lqTF4gFoslgieFjGFleoDGDrILQdrSv M7ccMLNDGRYnLa/Owq31tN/xM+NtdwyOz4eNbwtIaDgJ4aZLDyMi+WxbBLlNGZAzAx5J x3r2eK4Pg+75d8BmN2AEYJ346vH6kpfxGXUfaR86DySgt+QOuqcweMn/KEEyPcEEBpXV 1aRkNhw9NqA99D7UunAYHdBbWnJ6W7Ym2hb8bdQyweK5LSKgXdB5fUvOsA2aHSSUSaIC sxlSZ4Gj66Fay+bWxbCC0ZGbpuy1/1PvnGEET1KDQUQX/v43NWc0E8e0Sq3iAQZikpkv MuoA== X-Gm-Message-State: AKwxytd5SFPFT/dFjPwKYb49OQsXIwhdYFBzUwmVZPGsOFEfhgVe9/tB zC6PUH9ZX32X0boea/Nsv0qlUFCl X-Google-Smtp-Source: AH8x225Rc5A1NbIeKVnRTsg7FCjwTghgnPSxeUKIST5m2ZYBKnVbZwwEX28oxZULu5Vj/a3EQ5mtTw== X-Received: by 2002:a17:902:43:: with SMTP id 61-v6mr6185320pla.73.1516739462813; Tue, 23 Jan 2018 12:31:02 -0800 (PST) Received: from DESKTOP-CEH0M93.lan ([2001:470:1f05:c3e:818:d675:53b:bcf3]) by smtp.gmail.com with ESMTPSA id m67sm6046638pfi.157.2018.01.23.12.31.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jan 2018 12:31:02 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Tue, 23 Jan 2018 12:30:52 -0800 Message-Id: <1516739452-24505-1-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516676235-9488-1-git-send-email-rosenp@gmail.com> References: <1516676235-9488-1-git-send-email-rosenp@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 [2607:f8b0:400e:c05:0:0:0:243 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 (rosenp[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] procd: get rid of putenv usage. 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: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org setenv is prefered according to POSIX. Also allows staticly allocated strings. Saves 200 bytes when stripped. 432 without. Signed-off-by: Rosen Penev --- service/instance.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/service/instance.c b/service/instance.c index 12c2efe..ecbb6ea 100644 --- a/service/instance.c +++ b/service/instance.c @@ -279,7 +279,6 @@ instance_run(struct service_instance *in, int _stdout, int _stderr) struct blobmsg_list_node *var; struct blob_attr *cur; char **argv; - char *ld_preload; int argc = 1; /* NULL terminated */ int rem, _stdin; bool seccomp = !in->trace && !in->has_jail && in->seccomp; @@ -297,8 +296,8 @@ instance_run(struct service_instance *in, int _stdout, int _stderr) if (seccomp) setenv("SECCOMP_FILE", in->seccomp, 1); - if (setlbf && asprintf(&ld_preload, "LD_PRELOAD=/lib/libsetlbf.so") > 0) - putenv(ld_preload); + if (setlbf) + setenv("LD_PRELOAD", "/lib/libsetlbf.so", 1); blobmsg_list_for_each(&in->limits, var) instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));