diff options
| -rw-r--r-- | meta/recipes-core/systemd/systemd.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_243.bb | 1 |
3 files changed, 2 insertions, 42 deletions
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc index 7f3a59c208..6965b3b482 100644 --- a/meta/recipes-core/systemd/systemd.inc +++ b/meta/recipes-core/systemd/systemd.inc @@ -14,10 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" -SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a" +SRCREV = "fab6f010ac6c3bc93a10868de722d7c8c3622eb9" SRCBRANCH = "v243-stable" SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}" S = "${WORKDIR}/git" -PV_append = "+${SRCPV}" +PV_append = ".2" diff --git a/meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch b/meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch deleted file mode 100644 index fd147a18be..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1b3156edd291e0882d80a695d035dd30521345d1 Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Fri, 6 Sep 2019 15:04:01 +0200 -Subject: [PATCH] pstore: fix use after free - -The memory is still needed in the sd_journal_sendv() after the 'if' block. - -(cherry picked from commit 1e19f5ac0d680a63eccae7ef1fc6ce225dca0bbf) - -Upstream-Status: Backport - -Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> ---- - src/pstore/pstore.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c -index c760b3e899..8ffe523830 100644 ---- a/src/pstore/pstore.c -+++ b/src/pstore/pstore.c -@@ -117,6 +117,7 @@ static int compare_pstore_entries(const void *_a, const void *_b) { - - static int move_file(PStoreEntry *pe, const char *subdir) { - _cleanup_free_ char *ifd_path = NULL, *ofd_path = NULL; -+ _cleanup_free_ void *field = NULL; - const char *suffix, *message; - struct iovec iovec[2]; - int n_iovec = 0, r; -@@ -138,7 +139,6 @@ static int move_file(PStoreEntry *pe, const char *subdir) { - iovec[n_iovec++] = IOVEC_MAKE_STRING(message); - - if (pe->content_size > 0) { -- _cleanup_free_ void *field = NULL; - size_t field_size; - - field_size = strlen("FILE=") + pe->content_size; --- -2.14.4 - diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb index b31d0b5ed4..ac7a5f86b3 100644 --- a/meta/recipes-core/systemd/systemd_243.bb +++ b/meta/recipes-core/systemd/systemd_243.bb @@ -24,7 +24,6 @@ SRC_URI += "file://touchscreen.rules \ file://0005-rules-watch-metadata-changes-in-ide-devices.patch \ file://0001-unit-file.c-consider-symlink-on-filesystems-like-NFS.patch \ file://99-default.preset \ - file://0001-pstore-fix-use-after-free.patch \ " # patches needed by musl |