diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-21 17:32:00 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-21 17:32:00 +0100 |
| commit | 61f10f985e19dfe20a4d9552902625edd5b6eabb (patch) | |
| tree | 50db31971b38c4e0358253ef5005058a46fc773e /sys-process/lsof | |
| parent | 34dea8e38f88007799629d0a56b12dec480b1d21 (diff) | |
gentoo resync : 21.06.2021
Diffstat (limited to 'sys-process/lsof')
| -rw-r--r-- | sys-process/lsof/Manifest | 3 | ||||
| -rw-r--r-- | sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch | 63 | ||||
| -rw-r--r-- | sys-process/lsof/lsof-4.94.0-r1.ebuild (renamed from sys-process/lsof/lsof-4.94.0.ebuild) | 1 |
3 files changed, 66 insertions, 1 deletions
diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest index 5109cdb96e90..8fdfe0ae7572 100644 --- a/sys-process/lsof/Manifest +++ b/sys-process/lsof/Manifest @@ -1,4 +1,5 @@ AUX lsof-4.85-cross.patch 1061 BLAKE2B 730a02dfcd433bb6d46d3fecd87aa0913800408d67302bd9a9580ab3fec6e4a88e453890dec348796258eccd4c5185cc8f06ab2029347d632037f24dd0aa066e SHA512 9326a2708910a39ba3b81253c21149f8e4fa44b207e4c2a88f86c9322d2b50e6360760fcb13e00f644aba57ad207106c280db00ebc2d1f3d49405b54681548e8 +AUX lsof-4.94-arm-sigbus-fix.patch 1925 BLAKE2B 30bf5726c04a2451db39778b5646c6624220822c834da5eb5807310ae3a4cd2762cc87c73a2b720f32629794f4b152934b8578f71f442e37161e7c5307ef3ef4 SHA512 29bcb993560635aac5dfa8df23f9797bc07a2b9f5418d65ac9be64a766387a64f6b977609a467c3c146ffef32cdb2742425e351d6e2acfd22462999a14e4d87d DIST lsof-4.94.0.tar.gz 1340224 BLAKE2B b3d3c4707dac22c5431ac37c6a9f28ba5057b9a8dce65038934f1148209ef4615012ed887e263ec648679d0d95a06c78ed83a7d76cc8d97c05c013c563938793 SHA512 852b12e621e1dbf71e5f7fd848a200339ca278fbe8c39dcd33f745d1aea4e61552c0f30a3f6469ad9d4b86a9163e677f8c95298159ebd647357734225aa06c0c -EBUILD lsof-4.94.0.ebuild 3435 BLAKE2B 90e2eb7c2a94f9d1623fcff9495b47b488a1f4fee87c43f81a5ab4b846961145d12bee5f5e05881a5377acee224d47a3148037ac550bc523436a719690738910 SHA512 56b7bbfe09860890504e68fcc5b26827802c91d0a115e4d9b902cf0ebcce5bd313bbab52951b83553c52c3908989030f850e9b0be38e8df119ee5f69082dfef2 +EBUILD lsof-4.94.0-r1.ebuild 3482 BLAKE2B 2bd5766194598ed10580e4e869078ce64aee9f1a08226eb74b8e0fa5bdf794b8b3c740aad039e95be63b7d36d054499c0875e0190f767c97d8c0c315d168d33c SHA512 3ea260a7921b42356ef71de112115a9b198d9f6bd06c74d52f0c4c9bf3ed089498132fcd6d8ce4bd4a338539d691791ec4a0adaa1b6a3e3ec1e7610b250d5cae MISC metadata.xml 410 BLAKE2B fd0f172a687fe180b6fc367195925576c468612bbb516fe582ed6fb8be19c5de238f9ce3e762f2bedba9802167c55995f5d8319ffeb681cdb4a91e01a9292ab2 SHA512 47b91158e1621c03685f821f3126fbd3c4a6336fedb79c85f7fc245fe0a724b2df46e18abd15f926f5739b70e93072817ccde5862c9712314bf7cd9a4e43a812 diff --git a/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch new file mode 100644 index 000000000000..95bad206372e --- /dev/null +++ b/sys-process/lsof/files/lsof-4.94-arm-sigbus-fix.patch @@ -0,0 +1,63 @@ +https://bugs.gentoo.org/797358 + +From 21cb1dad1243f4c0a427d893babab12e48b60f0e Mon Sep 17 00:00:00 2001 +From: Masatake YAMATO <yamato@redhat.com> +Date: Sun, 20 Jun 2021 21:40:55 +0900 +Subject: [PATCH] Adjust alignment of buffer passed to stat() + +Close #160. + +The original code passes char[] buffer to stat(). +This can be cause a SIGBUS. + +#160 reported an actual crash on armv7a + glibc-2.33 platform. +See also https://sourceware.org/bugzilla/show_bug.cgi?id=27993. + +The issue is reported by @10ne1. + +Signed-off-by: Masatake YAMATO <yamato@redhat.com> +[Adrian: Backported to 4.94] +Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com> +--- a/misc.c ++++ b/misc.c +@@ -293,7 +293,15 @@ doinchild(fn, fp, rbuf, rbln) + */ + + int r_al, r_rbln; +- char r_arg[MAXPATHLEN+1], r_rbuf[MAXPATHLEN+1]; ++ char r_arg[MAXPATHLEN+1]; ++ union { ++ char r_rbuf[MAXPATHLEN+1]; ++ /* ++ * This field is only for adjusting the alignment of r_rbuf that ++ * can be used as an argument for stat(). ++ */ ++ struct stat _; ++ } r; + int (*r_fn)(); + /* + * Close sufficient open file descriptors except Pipes[0] and +@@ -358,16 +366,16 @@ doinchild(fn, fp, rbuf, rbln) + || read(Pipes[0], r_arg, r_al) != r_al + || read(Pipes[0], (char *)&r_rbln, sizeof(r_rbln)) + != (int)sizeof(r_rbln) +- || r_rbln < 1 || r_rbln > (int)sizeof(r_rbuf)) ++ || r_rbln < 1 || r_rbln > (int)sizeof(r.r_rbuf)) + break; +- zeromem (r_rbuf, r_rbln); +- rv = r_fn(r_arg, r_rbuf, r_rbln); ++ zeromem (r.r_rbuf, r_rbln); ++ rv = r_fn(r_arg, r.r_rbuf, r_rbln); + en = errno; + if (write(Pipes[3], (char *)&rv, sizeof(rv)) + != sizeof(rv) + || write(Pipes[3], (char *)&en, sizeof(en)) + != sizeof(en) +- || write(Pipes[3], r_rbuf, r_rbln) != r_rbln) ++ || write(Pipes[3], r.r_rbuf, r_rbln) != r_rbln) + break; + } + (void) _exit(0); +-- +2.32.0 + diff --git a/sys-process/lsof/lsof-4.94.0.ebuild b/sys-process/lsof/lsof-4.94.0-r1.ebuild index e71171a60c4d..f90987e76701 100644 --- a/sys-process/lsof/lsof-4.94.0.ebuild +++ b/sys-process/lsof/lsof-4.94.0-r1.ebuild @@ -28,6 +28,7 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-4.85-cross.patch #432120 + "${FILESDIR}"/${PN}-4.94-arm-sigbus-fix.patch ) src_prepare() { |