Date: Wed, 28 Mar 2018 20:34:15 +0200 From: Oliver Pinter <oliver.pinter@hardenedbsd.org> To: Eitan Adler <eadler@freebsd.org>, cem@freebsd.org Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r330897 - in stable/11: bin/cat bin/chflags bin/chmod bin/cp bin/date bin/dd bin/df bin/domainname bin/echo bin/ed bin/hostname bin/kill bin/ln bin/ls bin/mkdir bin/mv bin/pax bin/ps bi... Message-ID: <CAPQ4ffsV4W2stNKOO3znXeuYbOWd-9KxfiewnA%2B08iLwRrwAWQ@mail.gmail.com> In-Reply-To: <CAPQ4fftrKyRKudLE9MPPo2Tns8rr2gz4jxaq%2BC57=O%2Bqmsf5iw@mail.gmail.com> References: <201803140319.w2E3JuGP036341@repo.freebsd.org> <CAPQ4fft6jREbRrGmh=zo7Oc75QmxSDg8T5%2BtFkv4TmTCnqShgg@mail.gmail.com> <CAPQ4fftrKyRKudLE9MPPo2Tns8rr2gz4jxaq%2BC57=O%2Bqmsf5iw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000021f99505687d419c Content-Type: text/plain; charset="UTF-8" On 3/28/18, Oliver Pinter <oliver.pinter@hardenedbsd.org> wrote: > On 3/28/18, Oliver Pinter <oliver.pinter@hardenedbsd.org> wrote: >> Hi! >> >> This part of the MFC is wrong: >> >> https://svnweb.freebsd.org/base/stable/11/sys/sys/random.h?limit_changes=0&r1=330897&r2=330896&pathrev=330897 >> >> Could you please MFC back the other random related changes too? Some >> of them made by cem@. > > Namely these commits: > > commit b95744ba0ac2f46a95ecbe423a4d8dd7c9513da0 > Author: Oliver Pinter <oliver.pinter@hardenedbsd.org> > Date: Sun Oct 15 17:15:48 2017 +0200 > > opBSD MFC r324394: random(4): Gather entropy from Pure sources > > At initialization, hc_source_mask only includes non-Pure sources. > > The patch changes source registration to enable the registered source in > the > hc_source_mask bitmask. This mask governs which sources are harvested. > > This patch also disallows userspace from disabling such sources. > > PR: 222807 > Submitted by: W. Dean Freeman <badfilemagic AT gmail.com> > Reviewed by: jmg (earlier version), delphij > Approved by: secteam (delphij) > Obtained from: HBSD 0054e3e170e083811acc9f3b637f8be8a86c03e7 > Security: yes > Differential Revision: https://reviews.freebsd.org/D12611 > > (cherry picked from commit 1c36667f647c87c89227b495e8a79ff1d38a2d31) > > Author: cem <cem@FreeBSD.org> > Original-commit-date: Sat Oct 7 19:02:03 2017 +0000 > svn-commit-id: /head/ r324394 > Signed-off-by: Oliver Pinter <oliver.pinter@hardenedbsd.org> > > commit 6c94c5ce8a5b3ed5dec3bb0437da293de1da22fc > Author: Oliver Pinter <oliver.pinter@hardenedbsd.org> > Date: Sun Oct 15 17:15:43 2017 +0200 > > opBSD MFC r324393: random(4): Add missing source descriptions > > Add source descriptions missed in r260847, r303035. > > While here, convert the array to C99 initializers. > > Reviewed by: delphij > Approved by: secteam (delphij) > Sponsored by: Dell EMC Isilon > Differential Revision: https://reviews.freebsd.org/D12618 > > (cherry picked from commit 25edb3fc554994c75b6282d88b1dd960fd476737) > > Adopted to 11-STABLE since arm/broadcom/bcm2835/bcm2835_rng.c > does not exists here. > > Author: cem <cem@FreeBSD.org> > Original-commit-date: Sat Oct 7 18:59:29 2017 +0000 > svn-commit-id: /head/ r324393 > Signed-off-by: Oliver Pinter <oliver.pinter@hardenedbsd.org> > > commit 28fc9178aca64f2fec46e2753187b35bcab8e962 > Author: Oliver Pinter <oliver.pinter@hardenedbsd.org> > Date: Sun Oct 15 17:15:37 2017 +0200 > > opBSD MFC r324372: random(4): Discard low entropy inputs > > The later fields of the harvest_event structure are predictable and > provide > little value to the entropy pool. Only feed in the relatively high > entropy > counter and explicit entropy buffer to increase measured input entropy. > > See also: > https://people.freebsd.org/~jmg/vbsdcon_2017_ddfreebsdrng_slides.pdf > > PR: 222807 > Submitted by: W. Dean Freeman <badfilemagic AT gmail.com> > Reviewed by: jmg (earlier version), delphij > Approved by: secteam (delphij) > Obtained from: HBSD 8d809124d563937edd84c9c9d5494406e359c55c > Security: no -- low entropy marginal input has no known > negative affect on pool quality > Differential Revision: https://reviews.freebsd.org/D12610 > > (cherry picked from commit 1d234c562d594d49fd330eef90cd1b8f0e73f8fa) > > Author: cem <cem@FreeBSD.org> > Original-commit-date: Fri Oct 6 18:27:55 2017 +0000 > svn-commit-id: /head/ r324372 > Signed-off-by: Oliver Pinter <oliver.pinter@hardenedbsd.org> > Or please apply the attached patch. > >> >> On 3/14/18, Eitan Adler <eadler@freebsd.org> wrote: >>> Author: eadler >>> Date: Wed Mar 14 03:19:51 2018 >>> New Revision: 330897 >>> URL: https://svnweb.freebsd.org/changeset/base/330897 >>> > > [... trim ...] > --00000000000021f99505687d419c Content-Type: text/plain; charset="US-ASCII"; name="sys-sys-random-h-mismerge.diff" Content-Disposition: attachment; filename="sys-sys-random-h-mismerge.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: file0 RnJvbSAzOGQ5YjY3MDgwNmM2NGMzMWY0OWY0MjU3MDdkNTlhYWQ4OWI2MjQ2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBPbGl2ZXIgUGludGVyIDxvbGl2ZXIucGludGVyQGhhcmRlbmVk YnNkLm9yZz4KRGF0ZTogV2VkLCAyOCBNYXIgMjAxOCAyMDoyNjozMCArMDIwMApTdWJqZWN0OiBb UEFUQ0hdIG9wQlNEOiByZXZlcnQgbWlzTUZDZCBwYXJ0cyBvZiBzeXMvc3lzL3JhbmRvbS5oCgpT aWduZWQtb2ZmLWJ5OiBPbGl2ZXIgUGludGVyIDxvbGl2ZXIucGludGVyQGhhcmRlbmVkYnNkLm9y Zz4KCmRpZmYgLS1naXQgYS9zeXMvc3lzL3JhbmRvbS5oIGIvc3lzL3N5cy9yYW5kb20uaAppbmRl eCA5ZTAzZTVlZjY1MjcuLjI2NzY0ODUxZDAwYyAxMDA2NDQKLS0tIGEvc3lzL3N5cy9yYW5kb20u aAorKysgYi9zeXMvc3lzL3JhbmRvbS5oCkBAIC02MCw5ICs2MCw5IEBAIHJlYWRfcmFuZG9tKHZv aWQgKmEgX191bnVzZWQsIHVfaW50IGIgX191bnVzZWQpCiAjZW5kaWYKIAogLyoKLSAqIE5vdGU6 IGlmIHlvdSBhZGQgb3IgcmVtb3ZlIG1lbWJlcnMgb2YgcmFuZG9tX2VudHJvcHlfc291cmNlLCBy ZW1lbWJlciB0bwotICogYWxzbyB1cGRhdGUgdGhlIHN0cmluZ3MgaW4gdGhlIHN0YXRpYyBhcnJh eSByYW5kb21fc291cmNlX2Rlc2NyW10gaW4KLSAqIHJhbmRvbV9oYXJ2ZXN0cS5jLgorICogTm90 ZTogaWYgeW91IGFkZCBvciByZW1vdmUgbWVtYmVycyBvZiByYW5kb21fZW50cm9weV9zb3VyY2Us IHJlbWVtYmVyIHRvIGFsc28gdXBkYXRlIHRoZQorICogS0FTU0VSVCByZWdhcmRpbmcgd2hhdCB2 YWxpZCBtZW1iZXJzIGFyZSBpbiByYW5kb21faGFydmVzdF9pbnRlcm5hbCgpLCBhbmQgcmVtZW1i ZXIgdGhlCisgKiBzdHJpbmdzIGluIHRoZSBzdGF0aWMgYXJyYXkgcmFuZG9tX3NvdXJjZV9kZXNj cltdIGluIHJhbmRvbV9oYXJ2ZXN0cS5jLgogICoKICAqIE5PVEU6IGNvbXBsYWluIGxvdWRseSB0 byBtYXJrbUAgb3Igb24gdGhlIGxpc3RzIGlmIHRoaXMgZW51bSBnZXRzIG1vcmUgdGhhbiAzMgog ICogZGlzdGluY3QgdmFsdWVzICgwLTMxKSEgRU5UUk9QWVNPVVJDRSBtYXkgYmUgPT0gMzIsIGJ1 dCBub3QgPiAzMi4KQEAgLTgzLDggKzgzLDcgQEAgZW51bSByYW5kb21fZW50cm9weV9zb3VyY2Ug ewogCVJBTkRPTV9VTUEsCS8qIFNwZWNpYWwhISBVTUEvU0xBQiBBbGxvY2F0b3IgKi8KIAlSQU5E T01fRU5WSVJPTk1FTlRBTF9FTkQgPSBSQU5ET01fVU1BLAogCS8qIEZhc3QgaGFyZHdhcmUgcmFu ZG9tLW51bWJlciBzb3VyY2VzIGZyb20gaGVyZSBvbi4gKi8KLQlSQU5ET01fUFVSRV9TVEFSVCwK LQlSQU5ET01fUFVSRV9PQ1RFT04gPSBSQU5ET01fUFVSRV9TVEFSVCwKKwlSQU5ET01fUFVSRV9P Q1RFT04sCiAJUkFORE9NX1BVUkVfU0FGRSwKIAlSQU5ET01fUFVSRV9HTFhTQiwKIAlSQU5ET01f UFVSRV9VQlNFQywKQEAgLTkzLDI5ICs5MiwxOSBAQCBlbnVtIHJhbmRvbV9lbnRyb3B5X3NvdXJj ZSB7CiAJUkFORE9NX1BVUkVfTkVIRU1JQUgsCiAJUkFORE9NX1BVUkVfUk5EVEVTVCwKIAlSQU5E T01fUFVSRV9WSVJUSU8sCi0JUkFORE9NX1BVUkVfQlJPQURDT00sCiAJRU5UUk9QWVNPVVJDRQog fTsKIAogI2RlZmluZSBSQU5ET01fSEFSVkVTVF9FVkVSWVRISU5HX01BU0sgKCgxIDw8IChSQU5E T01fRU5WSVJPTk1FTlRBTF9FTkQgKyAxKSkgLSAxKQotI2RlZmluZSBSQU5ET01fSEFSVkVTVF9Q VVJFX01BU0sgKCgoMSA8PCBFTlRST1BZU09VUkNFKSAtIDEpICYgKC0xVUwgPDwgUkFORE9NX1BV UkVfU1RBUlQpKQotCi0jZGVmaW5lIFJBTkRPTV9MRUdBQ1lfQk9PVF9FTlRST1BZX01PRFVMRQki L2Jvb3QvZW50cm9weSIKLSNkZWZpbmUgUkFORE9NX0NBQ0hFRF9CT09UX0VOVFJPUFlfTU9EVUxF CSJib290X2VudHJvcHlfY2FjaGUiCi0jZGVmaW5lCVJBTkRPTV9DQUNIRURfU0tJUF9TVEFSVAky NTYKIAogI2lmIGRlZmluZWQoREVWX1JBTkRPTSkKIHZvaWQgcmFuZG9tX2hhcnZlc3RfcXVldWUo Y29uc3Qgdm9pZCAqLCB1X2ludCwgdV9pbnQsIGVudW0gcmFuZG9tX2VudHJvcHlfc291cmNlKTsK IHZvaWQgcmFuZG9tX2hhcnZlc3RfZmFzdChjb25zdCB2b2lkICosIHVfaW50LCB1X2ludCwgZW51 bSByYW5kb21fZW50cm9weV9zb3VyY2UpOwogdm9pZCByYW5kb21faGFydmVzdF9kaXJlY3QoY29u c3Qgdm9pZCAqLCB1X2ludCwgdV9pbnQsIGVudW0gcmFuZG9tX2VudHJvcHlfc291cmNlKTsKLXZv aWQgcmFuZG9tX2hhcnZlc3RfcmVnaXN0ZXJfc291cmNlKGVudW0gcmFuZG9tX2VudHJvcHlfc291 cmNlKTsKLXZvaWQgcmFuZG9tX2hhcnZlc3RfZGVyZWdpc3Rlcl9zb3VyY2UoZW51bSByYW5kb21f ZW50cm9weV9zb3VyY2UpOwogI2Vsc2UKICNkZWZpbmUgcmFuZG9tX2hhcnZlc3RfcXVldWUoYSwg YiwgYywgZCkgZG8ge30gd2hpbGUgKDApCiAjZGVmaW5lIHJhbmRvbV9oYXJ2ZXN0X2Zhc3QoYSwg YiwgYywgZCkgZG8ge30gd2hpbGUgKDApCiAjZGVmaW5lIHJhbmRvbV9oYXJ2ZXN0X2RpcmVjdChh LCBiLCBjLCBkKSBkbyB7fSB3aGlsZSAoMCkKLSNkZWZpbmUgcmFuZG9tX2hhcnZlc3RfcmVnaXN0 ZXJfc291cmNlKGEpIGRvIHt9IHdoaWxlICgwKQotI2RlZmluZSByYW5kb21faGFydmVzdF9kZXJl Z2lzdGVyX3NvdXJjZShhKSBkbyB7fSB3aGlsZSAoMCkKICNlbmRpZgogCiAjaWYgZGVmaW5lZChS QU5ET01fRU5BQkxFX1VNQSkK --00000000000021f99505687d419c--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPQ4ffsV4W2stNKOO3znXeuYbOWd-9KxfiewnA%2B08iLwRrwAWQ>