diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-12-05 23:23:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-09 11:56:41 +0000 |
commit | 0406dd71964fca391b57f7bf43a7f37f6549fa15 (patch) | |
tree | 5ea0e7f849d5037aadf4354a9e945f412d5f4e1e /meta/recipes-core/systemd/systemd | |
parent | c1efb1772cfae044969233fe9a394ef163d7bd51 (diff) | |
download | openembedded-core-contrib-0406dd71964fca391b57f7bf43a7f37f6549fa15.tar.gz |
systemd: Upgrade 243 -> 243.2
Bugfix-only changes on the 243 stable branch.
Backported patch removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-pstore-fix-use-after-free.patch | 39 |
1 files changed, 0 insertions, 39 deletions
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 - |