From patchwork Mon Jun 13 06:59:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Etienne Champetier X-Patchwork-Id: 634421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rSkGv4VQTz9s9n for ; Mon, 13 Jun 2016 17:01:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ST8H91Qg; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCLqz-0003UE-1F; Mon, 13 Jun 2016 07:00:09 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bCLqw-0002Hx-B4 for lede-dev@lists.infradead.org; Mon, 13 Jun 2016 07:00:07 +0000 Received: by mail-wm0-x241.google.com with SMTP id m124so12334615wme.3 for ; Sun, 12 Jun 2016 23:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=bsyHp5a7GuSWFOPeWRLAuV/3OljmtBHVwRBneEw9jL4=; b=ST8H91QgKWhXonj6XbObjzTsxDmm7RvIFm39zQnKG2IOlXL080l/I8Xo+CWvyDV4LL WGDdO1PGm43fB1e4xzsL9g0UuhpS5Coop/OKUFOkeTsrG2g2n9NsDqhbS74DXFTImbv1 zDwYUxUUT2y/MD51HIMt5nwuL1aGTdCzhIvYLMQYuyQpolrxgrCqZgljvjwiUCptPJ3X D/nUjRv8YhZyipsAVGlqK9PE5A5O/eq/bFv8cME7LmJPUIyiWI3H0QpEyZpGk9qjA5AX 2dFbITN/USy8iaYojHmxF3j6d3fb1rVAOCytHDIPzgMCZgRioffoRgHBwSmaH9ivQnEb 8vDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=bsyHp5a7GuSWFOPeWRLAuV/3OljmtBHVwRBneEw9jL4=; b=ifm92L4blOdM66znRKWkjJY3OzK89qjH/a63s68X/isgD/fWdtPfloExBXQKw8q7tW ubH3V/g28UjqAPdD+N0h4uZOqxZfnEb0UMIhwuNLBbQdivklI1v30l3kBUaQkqu+T4xK NJUgN6UapYy7/YegcZ2O0jiURu6ONT9VMJfmDfJzC5/F5u24aE1+/GKQuwxGhnQrSixH CNMNYJgJSkuK4Z0qHSNdQRVX4u5iTLwIsbmhWO7WKE+H6fmUPQZ49RYbWSqBZGpz6wUd SrrJ71NRGu0nmyXDouQBfbNfxGIzy+GGRDAuLmm13XuFYzJOV8HYKwBY3GTxWkX2sv+p 480w== X-Gm-Message-State: ALyK8tIbEOC724u8jj9YVzpl7THfJE00KReDWzhptFXzaj1tgApKU/C1A8rYaRkx7RJPMw== X-Received: by 10.28.135.137 with SMTP id j131mr9683568wmd.47.1465801184054; Sun, 12 Jun 2016 23:59:44 -0700 (PDT) Received: from ubuntu1404.lxcnattst (ns623510.ovh.net. [5.135.134.9]) by smtp.gmail.com with ESMTPSA id kp9sm25839122wjb.28.2016.06.12.23.59.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Jun 2016 23:59:43 -0700 (PDT) From: Etienne CHAMPETIER To: lede-dev@lists.infradead.org Date: Mon, 13 Jun 2016 06:59:35 +0000 Message-Id: <1465801175-34626-1-git-send-email-champetier.etienne@gmail.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160613_000006_561906_251913E7 X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low 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 (champetier.etienne[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH v3] base-files: seed /dev/urandom X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Etienne CHAMPETIER MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This commit: 1) seed /dev/urandom with a saved seed as early as possible (using /lib/preinit/81_urandom_seed) 2) save a new seed using getrandom() so we are sure /dev/urandom pool is initialized (using /etc/init.d/urandom_seed) seed size is 512 bytes (ie /proc/sys/kernel/random/poolsize / 8) it's the same size as in ubuntu 14.04 and all systemd systems seed file is /etc/urandom.seed (need a writable path) seeding /dev/urandom doesn't change entropy estimation, so we still have "random: ubus urandom read with 4 bits of entropy available" messages in the logs, but we can now ignore them if after "urandom-seed: Seeding with ..." message We could also add an urandom.seed at build time to improve first boot v2: log preinit messages to /dev/kmsg v3: use non generic function name for logging, as /lib/preinit/ files are all sourced together in /etc/preinit Signed-off-by: Etienne CHAMPETIER --- package/base-files/files/etc/init.d/urandom_seed | 22 ++++++++++++++++++++++ .../base-files/files/lib/preinit/81_urandom_seed | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100755 package/base-files/files/etc/init.d/urandom_seed create mode 100644 package/base-files/files/lib/preinit/81_urandom_seed diff --git a/package/base-files/files/etc/init.d/urandom_seed b/package/base-files/files/etc/init.d/urandom_seed new file mode 100755 index 0000000..d7c1f71 --- /dev/null +++ b/package/base-files/files/etc/init.d/urandom_seed @@ -0,0 +1,22 @@ +#!/bin/sh /etc/rc.common + +START=99 + +SEED=/etc/urandom.seed + +error_exit() { + logger -t urandom_seed "$1" + exit 1 +} + +save_seed() { + touch $SEED.tmp || error_exit "touch failed" + chown root:root $SEED.tmp || error_exit "chown failed" + chmod 600 $SEED.tmp || error_exit "chmod failed" + getrandom 512 > $SEED.tmp || error_exit "getrandom failed" + mv $SEED.tmp $SEED || error_exit "mv failed" +} + +boot() { + save_seed +} diff --git a/package/base-files/files/lib/preinit/81_urandom_seed b/package/base-files/files/lib/preinit/81_urandom_seed new file mode 100644 index 0000000..76c849a --- /dev/null +++ b/package/base-files/files/lib/preinit/81_urandom_seed @@ -0,0 +1,19 @@ +#!/bin/sh + +log_urandom_seed() { + echo "urandom-seed: $1" > /dev/kmsg +} + +do_urandom_seed() { + S=/etc/urandom.seed + U=/dev/urandom + + [ -c $U ] || { log_urandom_seed "Something is wrong with $U"; return; } + [ -f $S ] || { log_urandom_seed "Seed file not found: $S"; return; } + [ -O $S -a -G $S -a ! -x $S ] || { log_urandom_seed "Wrong owner / permissions for $S"; return; } + + log_urandom_seed "Seeding with $S" + cat $S > $U +} + +boot_hook_add preinit_main do_urandom_seed