diff options
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch | 49 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-236-r1.ebuild (renamed from sys-apps/systemd/systemd-236.ebuild) | 1 |
3 files changed, 52 insertions, 1 deletions
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest index 2ddb98c4763b..f2542013df03 100644 --- a/sys-apps/systemd/Manifest +++ b/sys-apps/systemd/Manifest @@ -4,6 +4,7 @@ AUX 233-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022f AUX 234-uucp-group.patch 536 BLAKE2B 0620ab9871a74b8ccb4c435fa96125552eb7fd5950dc17e9013d645b2dd94e99a15f7ceaf318bac7d7cd66f28149c4f75d881d8157c2637c2780a5a6f73dd6a9 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 BLAKE2B 019ad0113d58d2833b582ac269ecbf4e51c6b46d3a3ba84357cf135ddbf34829e7e98c9c376b4b9bf717be5fefed8cea517f2cc4e9aefee08807185f1057dfbb SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 BLAKE2B ec6e9cb15160b91c54bf714229785c081044727e5d9e6f5ecfffa0df4ce84e4e71227f177aced29d24f3a26c7b118aba3ed1073fa2353cd7a44c509658f20dce SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 +AUX 236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch 1826 BLAKE2B 5df29b904142e88e33f133b53e4ad3bffd6e6698fdfdb6ffe66c0b7142305c5f119b1d6e5a02f5122d357cdc923af35ee07eb628833964148d3790b5254c6c3e SHA512 8ae19a0b8143eb45a566ce81ae37e2a0783cf352700842751ac817995c733b5e1fd7d594ebde7a504880cfe3358d59cd65ff139b50d3b7fb034b91cc9f2a8bc5 AUX 236-uucp-group.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766d606583d12930e0375a43b10871cfdafabacdaa5f3d70ed8e8f4256b66a61369f459419931e80f57a13cd9f953a SHA512 27a3f0a037494326674e9098eab96199d2dbbd84dfa94a7dd23df0bf7fc632d1ddb21643288e71cc64109342bbcfcc4d77add07348d70633ec1da7cdf2253dc9 AUX CVE-2017-15908.patch 1371 BLAKE2B ccb735919864347108366e33466d2daa5599825e8efcef29ad2139c20070443a6c2c6cb008ba018ea64a37f7046e366f42d45698d6c82aee19d38ca9f2b489d9 SHA512 e3ca9cb44981a7a5d80a7ca63d6c9249e42dc5af1290ecfd472ec377db4ac372a18c3a3b6a99e1b7cfa322f7c00f0a755c916f67273b0b1e0a0e37957035aba9 AUX generator-path.patch 1046 BLAKE2B 648d1fff6874135267647ff6ffb52ddd9e991af64fb2b41909246c173e55709c49edd6e47245d566457ba9f55bf6d758ed837ff740f58004f2790b5565f8e462 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 @@ -15,6 +16,6 @@ DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d EBUILD systemd-233-r6.ebuild 13389 BLAKE2B e0a359f8ca505fc1033951ed7905ac52877ebdf162d27dc15f7c307b2b55471f76bfd97aab92fe5b67a6f1fe55f34c8b14a76057ede2b6e9e5cfa65bda847cd5 SHA512 ad74871cfb5a6f91630ea8018598d5470f881bfcd58baf955c376134c9b5b9321766f749fbbdd58c9438f6ccead3806e3bb243abaa18b53533b5a5bd68eaafe9 EBUILD systemd-235-r1.ebuild 13481 BLAKE2B be0a0674aa5a9c151e03311a5e0ea50f6c879cf3ae9bbbbf49eb6a2f9ad8bea5fe65c113583006d69c60b703311881d5038ff79ede1bf91dff3fbd4c856714a3 SHA512 11245b058f3dea86cef8cd852b5cc59ede421c552e4a7e0d22a2666e87bc33e14df68e0029d169dc3f4189d3d25d8e0147eec20d48d9a2f3cc0b9c3c96ab8e99 -EBUILD systemd-236.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c +EBUILD systemd-236-r1.ebuild 12901 BLAKE2B 844d54ebf0433be199fa6256d44d824b0441492e4a389f38b3258bcd771822ff9da5a44505a62500141e15c4af00cbaa8c8e79f118327fc9764bcb318ca45f10 SHA512 a48be5f69543f34babf5ec2126b0f1426c2a95429779155841d374c9d298b6f74333fe222aacd2b93ead37ef9092b3f95542fe1de8285c353cbbf36f7a528cd4 EBUILD systemd-9999.ebuild 12817 BLAKE2B c7cb601e2bec78d4f03fcd7958cbf415aa4436c1ef0c0de924cac97e80bc46b9e687ae4b18e2bd1cf78ca2463c613da34a753d5d598c4dfe3dc82aebcfe49add SHA512 b7ad77337fe102094a49d246a77c0725855ab0ef20f4f0352762d35c53b7370bf81a8f8b3801e246e00bba5b1c38ff6d8ed2e90f4a3eb98fe02d69195ecdf72c MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544 diff --git a/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch b/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch new file mode 100644 index 000000000000..d1c451835e31 --- /dev/null +++ b/sys-apps/systemd/files/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch @@ -0,0 +1,49 @@ +From 357ffd95294e1f9a1e91f8ca01213fb7db2b7614 Mon Sep 17 00:00:00 2001 +From: Jan Alexander Steffens <jan.steffens@gmail.com> +Date: Mon, 18 Dec 2017 14:47:18 +0100 +Subject: [PATCH] cryptsetup-generator: Don't mistake NULL input as OOM (#7688) + +Since systemd v236, several Arch users complained that +systemd-cryptsetup-generator exits with an OOM error and that it +prevents the boot from continuing. + +Investigating the diff of cryptsetup-generator between v235 and v236 I +noticed that create_disk allowed for the `password` and `filtered` +variables to be NULL (they're handled with `strempty()`) but not their +`*_escaped` versions, and returned OOM errors in those cases. + +Fix this by checking that the input string is non-NULL before deciding +that `specifier_escape` had an OOM error. + +I could not test this fix myself, but some users have reported success. + +Downstream bug: https://bugs.archlinux.org/task/56733 +--- + src/cryptsetup/cryptsetup-generator.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c +index 7e61332e5..f91451353 100644 +--- a/src/cryptsetup/cryptsetup-generator.c ++++ b/src/cryptsetup/cryptsetup-generator.c +@@ -111,7 +111,7 @@ static int create_disk( + return log_error_errno(r, "Failed to generate unit name: %m"); + + password_escaped = specifier_escape(password); +- if (!password_escaped) ++ if (password && !password_escaped) + return log_oom(); + + f = fopen(p, "wxe"); +@@ -184,7 +184,7 @@ static int create_disk( + return r; + + filtered_escaped = specifier_escape(filtered); +- if (!filtered_escaped) ++ if (filtered && !filtered_escaped) + return log_oom(); + + fprintf(f, +-- +2.15.1 + diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236-r1.ebuild index 8142a96390ba..e70e61f3fc5f 100644 --- a/sys-apps/systemd/systemd-236.ebuild +++ b/sys-apps/systemd/systemd-236-r1.ebuild @@ -148,6 +148,7 @@ src_unpack() { src_prepare() { local PATCHES=( + "${FILESDIR}/236-0001-cryptsetup-generator-Don-t-mistake-NULL-input-as-OOM.patch" ) if ! use vanilla; then |