mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

systemd: update a uclibc specific patch to avoid segment fault error

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: c69816d2bf84369ba578bf9d92e01c9d91351a64)

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:25 +08:00
committed by Richard Purdie
parent 22ff50f3cb
commit 85dea57cbe
1 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
+33 -25
View File
@@ -1,10 +1,18 @@
Upstream-Status: Denied [no desire for uclibc support] Upstream-Status: Denied [no desire for uclibc support]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Index: git/src/journal/journal-file.c This patch is uclibc specific, thus not suitable for upstream.
===================================================================
--- git.orig/src/journal/journal-file.c 2014-04-22 22:53:05.000000000 -0700 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+++ git/src/journal/journal-file.c 2014-04-22 22:53:51.130236707 -0700 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 f2f1f35..092f87b 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -38,6 +38,8 @@ @@ -38,6 +38,8 @@
#include "compress.h" #include "compress.h"
#include "fsprg.h" #include "fsprg.h"
@@ -14,7 +22,7 @@ Index: git/src/journal/journal-file.c
#define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
#define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
@@ -314,7 +316,7 @@ @@ -314,7 +316,7 @@ static int journal_file_verify_header(JournalFile *f) {
static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
uint64_t old_size, new_size; uint64_t old_size, new_size;
@@ -23,7 +31,7 @@ Index: git/src/journal/journal-file.c
assert(f); assert(f);
@@ -362,9 +364,24 @@ @@ -362,9 +364,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
/* Note that the glibc fallocate() fallback is very /* Note that the glibc fallocate() fallback is very
inefficient, hence we try to minimize the allocation area inefficient, hence we try to minimize the allocation area
as we can. */ as we can. */
@@ -32,27 +40,24 @@ Index: git/src/journal/journal-file.c
if (r != 0) if (r != 0)
return -r; return -r;
+#else +#else
+ /* Use good old method to write zeros into the journal file + /* Write something every 512 bytes to make sure the block is allocated */
+ perhaps very inefficient yet working. */ + uint64_t len = new_size - old_size;
+ if(new_size > old_size) { + uint64_t offset = old_size;
+ char *buf = alloca(new_size - old_size); + for (offset += (len-1) % 512; len > 0; offset += 512) {
+ off_t oldpos = lseek(f->fd, 0, SEEK_CUR); + len -= 512;
+ bzero(buf, new_size - old_size); + if (pwrite(f->fd, "", 1, offset) != 1)
+ lseek(f->fd, old_size, SEEK_SET); + return -errno;
+ r = write(f->fd, buf, new_size - old_size); + }
+ lseek(f->fd, oldpos, SEEK_SET); +
+ }
+ if (r < 0)
+ return -errno;
+#endif /* HAVE_POSIX_FALLOCATE */ +#endif /* HAVE_POSIX_FALLOCATE */
if (fstat(f->fd, &f->last_stat) < 0) if (fstat(f->fd, &f->last_stat) < 0)
return -errno; return -errno;
Index: git/src/journal/journald-kmsg.c diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
=================================================================== index 12992e7..dc4fa93 100644
--- git.orig/src/journal/journald-kmsg.c 2014-04-22 22:53:05.000000000 -0700 --- a/src/journal/journald-kmsg.c
+++ git/src/journal/journald-kmsg.c 2014-04-22 22:54:27.830236809 -0700 +++ b/src/journal/journald-kmsg.c
@@ -437,6 +437,7 @@ @@ -437,6 +437,7 @@ fail:
int server_open_kernel_seqnum(Server *s) { int server_open_kernel_seqnum(Server *s) {
_cleanup_close_ int fd; _cleanup_close_ int fd;
uint64_t *p; uint64_t *p;
@@ -60,7 +65,7 @@ Index: git/src/journal/journald-kmsg.c
assert(s); assert(s);
@@ -449,8 +450,19 @@ @@ -449,8 +450,19 @@ int server_open_kernel_seqnum(Server *s) {
log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m");
return 0; return 0;
} }
@@ -82,3 +87,6 @@ Index: git/src/journal/journald-kmsg.c
log_error("Failed to allocate sequential number file, ignoring: %m"); log_error("Failed to allocate sequential number file, ignoring: %m");
return 0; return 0;
} }
--
1.7.9.5