diff options
Diffstat (limited to 'sys-apps/rng-tools')
| -rw-r--r-- | sys-apps/rng-tools/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch | 45 |
2 files changed, 0 insertions, 46 deletions
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest index 461a74c1fe77..6382037ba8ca 100644 --- a/sys-apps/rng-tools/Manifest +++ b/sys-apps/rng-tools/Manifest @@ -2,7 +2,6 @@ AUX rng-tools-5-fix-noctty.patch 2069 BLAKE2B 6de4e60b1855b74bfaa528e4dfa3fa2377 AUX rng-tools-5-fix-textrels-on-PIC-x86.patch 2677 BLAKE2B af3911de5a8d7c91bc8a3065d817497b9f46341a05851bfe8d45de481dc8daaba618e1cc176dd397cd63430b51b582fd880f803d69bba61e00deae91e56e3c87 SHA512 8c7c6bced6e0982069ba6ef99c169609ff452a55c32543c25f198a59f81d4e976caf400867cb52bbe2996363f22943ff73c678427da43ad3a019bbe29bd29ce1 AUX rng-tools-5-man-fill-watermark.patch 765 BLAKE2B 1e99d4961ba0e132fac5fbc7d5794ff638497662c0f9b16810d42428eb7fbdaa5dfe657ac961115587db2acf0672e67387077a317fe2afdc7eabdd4d1eb83e92 SHA512 8bc7a9903f9f77da2d55321605a2421bef27d8cedd3ea67e5547f4e59b85b3139b3cf269efe4c3abd767d87666e3e28b03e4fbf6984122febf45ea14af3332a0 AUX rng-tools-5-man-rng-device.patch 398 BLAKE2B 6781f201e9c87143aa56dbb35702e95441cdfc304233be40d9f28c929c18f955d710b32128eede20bee71bab789bc72318cd71af294c2e6bc6d721882c3d030c SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f -AUX rng-tools-6-fix-noctty.patch 2188 BLAKE2B 73eebe43b950e0ef261208c073f5b6c0fee6b4cabd216373c0973de61604c936200943a4b0574533ec3cacee8701253de55f5d6a730765fcadc9a6e099eed3b6 SHA512 dff3d3ef81e847d378ca45531e4eaa81f4028b2b08adc17c68bba108cb4604f3bf13daa8b0e46ccb8aec2626ff8fd983038544508f3117828cecfbb282762116 AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb1df629fb79ebf47d78c7d2e0f1aa9a867aff1f77133271325e2dbb2bfe5440921f5c16c2f0e8e5b SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b AUX rngd-confd-6 2038 BLAKE2B 0f239923693d167a6a53609822d15a92e0c0e98d9c090c17ea3a73ad4a187528cd9a5d4bf071ec544592ef3ce801c2c364ccba193c22940411629b14a486cd69 SHA512 fe58599105fbcf8e1bf5f584aeefa54681dfa9fa2cd73cd682acd348f170ca825b692a1a8d153b438096c580a4b0cdab56a03b32b5f9ae8e73f06c3535c1ea46 AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8 diff --git a/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch deleted file mode 100644 index e915150adb58..000000000000 --- a/sys-apps/rng-tools/files/rng-tools-6-fix-noctty.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Gokturk Yuksek <gokturk@binghamton.edu> -Subject: [PATCH] Fix rngd to open the entropy source with 'O_NOCTTY' flag - -When start-stop-daemon starts a rngd instance configured to use a tty -device as its entropy source, the application crashes due to not being -able to read from the entropy device. This is caused by -start-stop-daemon calling setsid() before executing rngd, which -disassociates the controlling terminal. When rngd attempts to open a -hardware entropy source that's a tty device, per POSIX rules, the -device becomes the controlling terminal for the process. Then rngd -calls daemon(), which internally calls setsid(), and consequently -disassociates the controlling terminal for the child. Meanwhile the -parent rngd process exits. This results in tty device hanging up. By -looking at the strace logs attached to the bug, it can be observed -that although the parent rngd process is able to read() from the -entropy source successfully, further attempts to read() by the child -rngd process return 0. This complies with the POSIX, which states that -read() calls on a hung up terminal shall return 0. - -Note that when rngd is started without start-stop-daemon, this problem -does not happen because at the time of opening the entropy source rngd -already has a controlling terminal. - -Prevent the entropy source from becoming the controlling terminal by -passing 'O_NOCTTY' flag to open() when opening an entropy source. This -flag prevents a tty device from becoming the controlling terminal for -a process without a controlling terminal at the time of open(). - -Thanks to John Bowler <jbowler@acm.org> for debugging the problem and -pinpointing the issue as well as confirming the fix. - -Gentoo-Bug-URL: https://bugs.gentoo.org/556456 -Reported-By: John Bowler <jbowler@acm.org> - ---- rng-tools-rng-tools-6/rngd_entsource.c -+++ rng-tools-rng-tools-6/rngd_entsource.c -@@ -162,7 +162,7 @@ - struct sysfs_attribute *rngavail; - char buf[16]; - -- ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY); -+ ent_src->rng_fd = open(ent_src->rng_fname, O_RDONLY | O_NOCTTY); - if (ent_src->rng_fd == -1) { - message(LOG_DAEMON|LOG_DEBUG, "Unable to open file: %s", ent_src->rng_fname); - return 1; |