[systemd-commits] 3 commits - TODO src/journal
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Sep 13 08:11:29 PDT 2012
TODO | 11 ++++++++++
src/journal/journal-authenticate.c | 20 +++++++++++--------
src/journal/journal-authenticate.h | 2 -
src/journal/journal-file.c | 38 +++++++++++++++++++++++--------------
src/journal/journal-verify.c | 2 -
5 files changed, 49 insertions(+), 24 deletions(-)
New commits:
commit a1cccad1fe88ddd6943e18af97cf7f466296970f
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Sep 13 17:11:10 2012 +0200
update TODO
diff --git a/TODO b/TODO
index e56ab1f..7ed2153 100644
--- a/TODO
+++ b/TODO
@@ -53,6 +53,17 @@ Bugfixes:
Features:
+* does vasprintf advance the struct vaargs? http://pastie.org/pastes/4712773/text
+
+* do shutdown audit/utmp msgs inside of PID 1, get rid of systemd-update-utmp-runlevel
+
+* make use of macros like this:
+
+ #define _cleanup_free_ __attribute__((cleanup(freep)))
+ #define _cleanup_fclose_ __attribute__((cleanup(fclosep)))
+
+* make timer units go away after they elapsed
+
+ refuse automount triggers when automount is queued for stop, much like we refuse socket triggers when sockets are queued for stop
* perfomance messages for selinux are gone from debug log?
commit b588975fb0292cbb23770d6fc2349f57ab5b0db8
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Sep 13 17:10:46 2012 +0200
journal: never assert directly on data read from the journal
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index e55162a..8dc0a3a 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -590,7 +590,9 @@ static int journal_file_link_data(JournalFile *f, Object *o, uint64_t offset, ui
assert(f);
assert(o);
assert(offset > 0);
- assert(o->object.type == OBJECT_DATA);
+
+ if (o->object.type != OBJECT_DATA)
+ return -EINVAL;
/* This might alter the window we are looking at */
@@ -798,22 +800,28 @@ static int journal_file_append_data(
uint64_t journal_file_entry_n_items(Object *o) {
assert(o);
- assert(o->object.type == OBJECT_ENTRY);
+
+ if (o->object.type != OBJECT_ENTRY)
+ return 0;
return (le64toh(o->object.size) - offsetof(Object, entry.items)) / sizeof(EntryItem);
}
uint64_t journal_file_entry_array_n_items(Object *o) {
assert(o);
- assert(o->object.type == OBJECT_ENTRY_ARRAY);
+
+ if (o->object.type != OBJECT_ENTRY_ARRAY)
+ return 0;
return (le64toh(o->object.size) - offsetof(Object, entry_array.items)) / sizeof(uint64_t);
}
uint64_t journal_file_hash_table_n_items(Object *o) {
assert(o);
- assert(o->object.type == OBJECT_DATA_HASH_TABLE ||
- o->object.type == OBJECT_FIELD_HASH_TABLE);
+
+ if (o->object.type != OBJECT_DATA_HASH_TABLE &&
+ o->object.type != OBJECT_FIELD_HASH_TABLE)
+ return 0;
return (le64toh(o->object.size) - offsetof(Object, hash_table.items)) / sizeof(HashItem);
}
@@ -949,7 +957,9 @@ static int journal_file_link_entry(JournalFile *f, Object *o, uint64_t offset) {
assert(f);
assert(o);
assert(offset > 0);
- assert(o->object.type == OBJECT_ENTRY);
+
+ if (o->object.type != OBJECT_ENTRY)
+ return -EINVAL;
__sync_synchronize();
commit 5996c7c295e073ce21d41305169132c8aa993ad0
Author: Lennart Poettering <lennart at poettering.net>
Date: Thu Sep 13 17:06:04 2012 +0200
journald: don't reposition window if we don't have to
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index 593bf7e..674f812 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -66,7 +66,7 @@ int journal_file_append_tag(JournalFile *f) {
/* Add the tag object itself, so that we can protect its
* header. This will exclude the actual hash value in it */
- r = journal_file_hmac_put_object(f, OBJECT_TAG, p);
+ r = journal_file_hmac_put_object(f, OBJECT_TAG, o, p);
if (r < 0)
return r;
@@ -229,9 +229,8 @@ int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) {
return 0;
}
-int journal_file_hmac_put_object(JournalFile *f, int type, uint64_t p) {
+int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p) {
int r;
- Object *o;
assert(f);
@@ -242,9 +241,14 @@ int journal_file_hmac_put_object(JournalFile *f, int type, uint64_t p) {
if (r < 0)
return r;
- r = journal_file_move_to_object(f, type, p, &o);
- if (r < 0)
- return r;
+ if (!o) {
+ r = journal_file_move_to_object(f, type, p, &o);
+ if (r < 0)
+ return r;
+ } else {
+ if (type >= 0 && o->object.type != type)
+ return -EBADMSG;
+ }
gcry_md_write(f->hmac, o, offsetof(ObjectHeader, payload));
@@ -460,7 +464,7 @@ int journal_file_append_first_tag(JournalFile *f) {
return -EINVAL;
p -= offsetof(Object, hash_table.items);
- r = journal_file_hmac_put_object(f, OBJECT_FIELD_HASH_TABLE, p);
+ r = journal_file_hmac_put_object(f, OBJECT_FIELD_HASH_TABLE, NULL, p);
if (r < 0)
return r;
@@ -469,7 +473,7 @@ int journal_file_append_first_tag(JournalFile *f) {
return -EINVAL;
p -= offsetof(Object, hash_table.items);
- r = journal_file_hmac_put_object(f, OBJECT_DATA_HASH_TABLE, p);
+ r = journal_file_hmac_put_object(f, OBJECT_DATA_HASH_TABLE, NULL, p);
if (r < 0)
return r;
diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h
index 3586464..0aaf836 100644
--- a/src/journal/journal-authenticate.h
+++ b/src/journal/journal-authenticate.h
@@ -33,7 +33,7 @@ int journal_file_append_first_tag(JournalFile *f);
int journal_file_hmac_setup(JournalFile *f);
int journal_file_hmac_start(JournalFile *f);
int journal_file_hmac_put_header(JournalFile *f);
-int journal_file_hmac_put_object(JournalFile *f, int type, uint64_t p);
+int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p);
int journal_file_fss_load(JournalFile *f);
int journal_file_parse_verification_key(JournalFile *f, const char *key);
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 8016852..e55162a 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -775,18 +775,18 @@ static int journal_file_append_data(
if (r < 0)
return r;
-#ifdef HAVE_GCRYPT
- r = journal_file_hmac_put_object(f, OBJECT_DATA, p);
- if (r < 0)
- return r;
-#endif
-
/* The linking might have altered the window, so let's
* refresh our pointer */
r = journal_file_move_to_object(f, OBJECT_DATA, p, &o);
if (r < 0)
return r;
+#ifdef HAVE_GCRYPT
+ r = journal_file_hmac_put_object(f, OBJECT_DATA, o, p);
+ if (r < 0)
+ return r;
+#endif
+
if (ret)
*ret = o;
@@ -866,7 +866,7 @@ static int link_entry_into_array(JournalFile *f,
return r;
#ifdef HAVE_GCRYPT
- r = journal_file_hmac_put_object(f, OBJECT_ENTRY_ARRAY, q);
+ r = journal_file_hmac_put_object(f, OBJECT_ENTRY_ARRAY, o, q);
if (r < 0)
return r;
#endif
@@ -1012,7 +1012,7 @@ static int journal_file_append_entry_internal(
o->entry.boot_id = f->header->boot_id;
#ifdef HAVE_GCRYPT
- r = journal_file_hmac_put_object(f, OBJECT_ENTRY, np);
+ r = journal_file_hmac_put_object(f, OBJECT_ENTRY, o, np);
if (r < 0)
return r;
#endif
diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index 5d134bd..629b238 100644
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -959,7 +959,7 @@ int journal_file_verify(
if (r < 0)
goto fail;
- r = journal_file_hmac_put_object(f, -1, q);
+ r = journal_file_hmac_put_object(f, -1, o, q);
if (r < 0)
goto fail;
More information about the systemd-commits
mailing list