mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

systemd: update a uclibc specific patch to avoid segment fault

Browse Source 
The alloca() function allocates space in the stack frame of the caller,
so using alloca(new_size - old_size) would possibly crash the stack,
causing a segment fault error.

This patch fixes the above problem by avoiding using this function in
journal-file.c.

[YOCTO #6201]

(From OE-Core rev: 96b6a2d446d28eabd9a943f5f2b5af12c24a7dbb)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi
2014-06-04 17:47:08 +08:00
committed by Richard Purdie
parent 9ee3f77ed9
commit 5bb9a05e0f
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
View File

@@ -1,10 +1,19 @@
Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: systemd-209/src/journal/journal-file.c
===================================================================
--- systemd-209.orig/src/journal/journal-file.c 2014-02-12 18:42:33.000000000 -0800
+++ systemd-209/src/journal/journal-file.c 2014-02-19 23:23:19.464631643 -0800
This patch is uclibc specific, thus not suitable for upstream.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
src/journal/journal-file.c | 16 +++++++++++++++-
src/journal/journald-kmsg.c | 16 ++++++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 0e1fc7f..e364298 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -38,6 +38,8 @@
#include "compress.h"
#include "fsprg.h"
@@ -14,7 +23,7 @@ Index: systemd-209/src/journal/journal-file.c
#define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
#define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
@@ -316,7 +318,7 @@
@@ -316,7 +318,7 @@ static int journal_file_verify_header(JournalFile *f) {
static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
uint64_t old_size, new_size;
@@ -23,7 +32,7 @@ Index: systemd-209/src/journal/journal-file.c
assert(f);
@@ -364,9 +366,24 @@
@@ -364,9 +366,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
/* Note that the glibc fallocate() fallback is very
inefficient, hence we try to minimize the allocation area
as we can. */
@@ -32,27 +41,24 @@ Index: systemd-209/src/journal/journal-file.c
if (r != 0)
return -r;
+#else
+ /* Use good old method to write zeros into the journal file
+ perhaps very inefficient yet working. */
+ if(new_size > old_size) {
+ char *buf = alloca(new_size - old_size);
+ off_t oldpos = lseek(f->fd, 0, SEEK_CUR);
+ bzero(buf, new_size - old_size);
+ lseek(f->fd, old_size, SEEK_SET);
+ r = write(f->fd, buf, new_size - old_size);
+ lseek(f->fd, oldpos, SEEK_SET);
+ }
+ if (r < 0)
+ return -errno;
+ /* Write something every 512 bytes to make sure the block is allocated */
+ uint64_t len = new_size - old_size;
+ uint64_t offset = old_size;
+ for (offset += (len-1) % 512; len > 0; offset += 512) {
+ len -= 512;
+ if (pwrite(f->fd, "", 1, offset) != 1)
+ return -errno;
+ }
+
+#endif /* HAVE_POSIX_FALLOCATE */
if (fstat(f->fd, &f->last_stat) < 0)
return -errno;
Index: systemd-209/src/journal/journald-kmsg.c
===================================================================
--- systemd-209.orig/src/journal/journald-kmsg.c 2014-02-19 15:03:09.000000000 -0800
+++ systemd-209/src/journal/journald-kmsg.c 2014-02-19 23:22:14.396630422 -0800
@@ -441,6 +441,7 @@
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index 05b128f..320a52e 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -441,6 +441,7 @@ fail:
int server_open_kernel_seqnum(Server *s) {
int fd;
@@ -60,7 +66,7 @@ Index: systemd-209/src/journal/journald-kmsg.c
uint64_t *p;
assert(s);
@@ -454,8 +455,19 @@
@@ -454,8 +455,19 @@ int server_open_kernel_seqnum(Server *s) {
log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m");
return 0;
}
@@ -82,3 +88,6 @@ Index: systemd-209/src/journal/journald-kmsg.c
log_error("Failed to allocate sequential number file, ignoring: %m");
close_nointr_nofail(fd);
return 0;
--
1.7.9.5