diff options
author | Peter Marko <peter.marko@siemens.com> | 2023-08-10 22:22:37 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-08-16 03:55:13 -1000 |
commit | 729e5e306f02535df51dc394cd45f7a7c4d16cf4 (patch) | |
tree | 924bb316b33fc97639e31982cd5cf6c6cd251bda /meta/recipes-extended/procps/procps_3.3.16.bb | |
parent | 3e0bb5455bcef1081ed0b165bbddb3fd1f385858 (diff) | |
download | poky-729e5e306f02535df51dc394cd45f7a7c4d16cf4.tar.gz |
procps: patch CVE-2023-4016
Backport patch from upstream master.
There were three changes needed to apply the patch:
* move NEWS change to start of the file
* change file location from src/ps/ to ps/
* change xmalloc/xcmalloc to malloc/cmalloc
The x*malloc functions were introduced in commit in future version.
https://gitlab.com/procps-ng/procps/-/commit/584028dbe513127ef68c55aa631480454bcc26bf
They call the original function plus additionally throw error when out of memory.
https://gitlab.com/procps-ng/procps/-/blob/v4.0.3/local/xalloc.h?ref_type=tags
So this replacement is correct in context of our version.
(From OE-Core rev: 1632c7223b2f8cd595e1ba20bc006c68fc833295)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-extended/procps/procps_3.3.16.bb')
-rw-r--r-- | meta/recipes-extended/procps/procps_3.3.16.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-extended/procps/procps_3.3.16.bb b/meta/recipes-extended/procps/procps_3.3.16.bb index 3a8289b359..ac27734a6f 100644 --- a/meta/recipes-extended/procps/procps_3.3.16.bb +++ b/meta/recipes-extended/procps/procps_3.3.16.bb | |||
@@ -14,6 +14,7 @@ inherit autotools gettext pkgconfig update-alternatives | |||
14 | 14 | ||
15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ | 15 | SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \ |
16 | file://sysctl.conf \ | 16 | file://sysctl.conf \ |
17 | file://CVE-2023-4016.patch \ | ||
17 | " | 18 | " |
18 | SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" | 19 | SRCREV = "59c88e18f29000ceaf7e5f98181b07be443cf12f" |
19 | 20 | ||