From patchwork Tue Jan 23 02:57:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 864534 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="fZow6ogC"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HwG5HHqq"; 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 3zQXzJ2yflz9s71 for ; Tue, 23 Jan 2018 13:57:48 +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=Rw9eRmZ20s3QrjcNXsjfL69Rq0IyB7ZyfN7oumWlBB4=; b=fZow6ogCrHZYN5 lEuhaZjFiMpL2OgYrwTdeLL/1lff0sWaVfW4yAF77JX2gKX2N1mkxUDZV0OytCZSOytg0IzOr3JFe YKwUYSDkKahEpuZPLOMmCb0g10OlnFb2fTSv4+KkMKDkg0Kk9vGwwWSTvqwmhp1uvcl/IA9ima81k DWWCfTveTSWzrXqsTWvKBIQ8MdBE/WW6/1weKxkK3ueMsfyzf7a6Q+ey9q1kIh6+VxBxuDJaPEra0 o84YnUD4b2HkqJsqjW9aJ0Gk/hlMymu8RnVgHJ+2zaM5gun43dcVoMnyvDOHT6ekQJI8tIHE4CIQi lbWOp7r4pKp5PnbD7UZQ==; 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 1edomL-0002S8-R6; Tue, 23 Jan 2018 02:57:41 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1edomI-0002RL-Jc for lede-dev@lists.infradead.org; Tue, 23 Jan 2018 02:57:40 +0000 Received: by mail-pf0-x241.google.com with SMTP id y5so8643541pff.13 for ; Mon, 22 Jan 2018 18:57:26 -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=5RHRqIE5Ujbp4b+zYJG/hzpuyyLtdDqa0HQHevj0H9I=; b=HwG5HHqqczGk20Ahd6qxOrmTXQx7dSFWr+svq9IIJL/5PfbWqsGuEyh2WSdPfik/Q8 MWiKTtB+72EZdEMwmExkNlKNc+Q0SjutdC7qe4mWHTBLptTVbJI8s4iDiD0n+sajhpjk onqRtyHDwJt24jyKrd+r3yZDd+vtoTa9+CEndkkSrcY7NI+EULNR3a6lIkV3RnVkwnDg tL7/RpiBjJkRGSccCr/6GC7K5hk5jOcbB/ZJiZ+pBE348wSuBG9bgNXGhWh9UoAhiERr kZ1hRJ4hv9/1cMsjRXzPptpmiVIYTPez2djSXTkZFpidYeRmbgMBpzI3eaJJt2IWvTtO ysfw== 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=5RHRqIE5Ujbp4b+zYJG/hzpuyyLtdDqa0HQHevj0H9I=; b=bjTFWlFY+pg97S2hAD69fTrSZdVFlM2J9XzRtD4suCkGQ4n2LAbvs/PL03ZcBGt1qZ oOtbUlrmOkeNzeGgFeQItLg2tFATXitaFuCOp/qo+Y4lYeDkxUNtI/rQOqlLo/bQH6K1 Ap3Qj5t5DatTQPd+dWXhndYEL1xE0Uc+YzBf7q0zQe/NJeIgVCfQM7PDRIsYUgNHdvwU kd7FUqzTOBmC3FsGb272fcDYIebq1Ia/ec6/D002UcjkVsesnYiqvBkFltjLiJBZoUES hj1Qat9Te5xcPxQJQf+/blEkUAmjF8hsmMKPVFijyKf5jWRtAOlZqgMiik1N0t/rPjsH sVkQ== X-Gm-Message-State: AKwxytePHpovZBxcITckA7fraEIi1QadROJZ1odakKB3AK48imfO5Gc8 cGpm7L5njbQela71pc0tXcqXp6yc X-Google-Smtp-Source: AH8x227iJsfC3BnOniFmCGHYEkt7HjmilEUn976lZSKrGpHOs02Nq1nRiLzQLFL1r/6btGBr9se9LA== X-Received: by 10.99.125.78 with SMTP id m14mr8112139pgn.383.1516676245449; Mon, 22 Jan 2018 18:57:25 -0800 (PST) Received: from DESKTOP-CEH0M93.lan ([2001:470:1f05:c3e:18e6:c752:5549:7f6e]) by smtp.gmail.com with ESMTPSA id w63sm3031669pfa.173.2018.01.22.18.57.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Jan 2018 18:57:24 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Mon, 22 Jan 2018 18:57:15 -0800 Message-Id: <1516676235-9488-1-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 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:c00: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 (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. 400 without. Signed-off-by: Rosen Penev --- service/instance.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/instance.c b/service/instance.c index 12c2efe..848679c 100644 --- a/service/instance.c +++ b/service/instance.c @@ -279,7 +279,7 @@ instance_run(struct service_instance *in, int _stdout, int _stderr) struct blobmsg_list_node *var; struct blob_attr *cur; char **argv; - char *ld_preload; + char *ld_preload = "/lib/libsetlbf.so"; int argc = 1; /* NULL terminated */ int rem, _stdin; bool seccomp = !in->trace && !in->has_jail && in->seccomp; @@ -297,8 +297,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", ld_preload, 1); blobmsg_list_for_each(&in->limits, var) instance_limits(blobmsg_name(var->data), blobmsg_data(var->data));