chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap: hashmap_move_one() should return -ENOENT when 'other' is NULL
[elogind.git]
/
src
/
journal
/
journald-native.c
diff --git
a/src/journal/journald-native.c
b/src/journal/journald-native.c
index 359d962c72cb5d42a0a39b85c45d91d33dc9af10..a6352022dd8b55422b2707fb2b618f1ab26b7cef 100644
(file)
--- a/
src/journal/journald-native.c
+++ b/
src/journal/journald-native.c
@@
-31,13
+31,9
@@
#include "journald-kmsg.h"
#include "journald-console.h"
#include "journald-syslog.h"
#include "journald-kmsg.h"
#include "journald-console.h"
#include "journald-syslog.h"
+#include "journald-wall.h"
-/* Make sure not to make this smaller than the maximum coredump
- * size. See COREDUMP_MAX in coredump.c */
-#define ENTRY_SIZE_MAX (1024*1024*768)
-#define DATA_SIZE_MAX (1024*1024*768)
-
-static bool valid_user_field(const char *p, size_t l) {
+bool valid_user_field(const char *p, size_t l, bool allow_protected) {
const char *a;
/* We kinda enforce POSIX syntax recommendations for
const char *a;
/* We kinda enforce POSIX syntax recommendations for
@@
-55,7
+51,7
@@
static bool valid_user_field(const char *p, size_t l) {
return false;
/* Variables starting with an underscore are protected */
return false;
/* Variables starting with an underscore are protected */
- if (p[0] == '_')
+ if (
!allow_protected &&
p[0] == '_')
return false;
/* Don't allow digits as first character */
return false;
/* Don't allow digits as first character */
@@
-64,9
+60,9
@@
static bool valid_user_field(const char *p, size_t l) {
/* Only allow A-Z0-9 and '_' */
for (a = p; a < p + l; a++)
/* Only allow A-Z0-9 and '_' */
for (a = p; a < p + l; a++)
- if (
!((*a >= 'A' && *a <= 'Z') ||
- (*a >= '0' && *a <= '9') ||
-
*a == '_')
)
+ if (
(*a < 'A' || *a > 'Z') &&
+ (*a < '0' || *a > '9') &&
+
*a != '_'
)
return false;
return true;
return false;
return true;
@@
-86,7
+82,7
@@
void server_process_native_message(
struct iovec *iovec = NULL;
unsigned n = 0, j, tn = (unsigned) -1;
const char *p;
struct iovec *iovec = NULL;
unsigned n = 0, j, tn = (unsigned) -1;
const char *p;
- size_t remaining, m = 0;
+ size_t remaining, m = 0
, entry_size = 0
;
int priority = LOG_INFO;
char *identifier = NULL, *message = NULL;
pid_t object_pid = 0;
int priority = LOG_INFO;
char *identifier = NULL, *message = NULL;
pid_t object_pid = 0;
@@
-110,9
+106,16
@@
void server_process_native_message(
if (e == p) {
/* Entry separator */
if (e == p) {
/* Entry separator */
+
+ if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
+ log_debug("Entry is too big with %u properties and %zu bytes, ignoring.", n, entry_size);
+ continue;
+ }
+
server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
n = 0;
priority = LOG_INFO;
server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
n = 0;
priority = LOG_INFO;
+ entry_size = 0;
p++;
remaining--;
p++;
remaining--;
@@
-130,15
+133,14
@@
void server_process_native_message(
/* A property follows */
/* n received properties, +1 for _TRANSPORT */
/* A property follows */
/* n received properties, +1 for _TRANSPORT */
- if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS +
- !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
+ if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS + !!object_pid * N_IOVEC_OBJECT_FIELDS)) {
log_oom();
break;
}
q = memchr(p, '=', e - p);
if (q) {
log_oom();
break;
}
q = memchr(p, '=', e - p);
if (q) {
- if (valid_user_field(p, q - p)) {
+ if (valid_user_field(p, q - p
, false
)) {
size_t l;
l = e - p;
size_t l;
l = e - p;
@@
-149,6
+151,7
@@
void server_process_native_message(
* field */
iovec[n].iov_base = (char*) p;
iovec[n].iov_len = l;
* field */
iovec[n].iov_base = (char*) p;
iovec[n].iov_len = l;
+ entry_size += iovec[n].iov_len;
n++;
/* We need to determine the priority
n++;
/* We need to determine the priority
@@
-218,7
+221,7
@@
void server_process_native_message(
l = le64toh(l_le);
if (l > DATA_SIZE_MAX) {
l = le64toh(l_le);
if (l > DATA_SIZE_MAX) {
- log_debug("Received binary data block
too large, ignoring."
);
+ log_debug("Received binary data block
of %"PRIu64" bytes is too large, ignoring.", l
);
break;
}
break;
}
@@
-238,9
+241,10
@@
void server_process_native_message(
k[e - p] = '=';
memcpy(k + (e - p) + 1, e + 1 + sizeof(uint64_t), l);
k[e - p] = '=';
memcpy(k + (e - p) + 1, e + 1 + sizeof(uint64_t), l);
- if (valid_user_field(p, e - p)) {
+ if (valid_user_field(p, e - p
, false
)) {
iovec[n].iov_base = k;
iovec[n].iov_len = (e - p) + 1 + l;
iovec[n].iov_base = k;
iovec[n].iov_len = (e - p) + 1 + l;
+ entry_size += iovec[n].iov_len;
n++;
} else
free(k);
n++;
} else
free(k);
@@
-255,6
+259,13
@@
void server_process_native_message(
tn = n++;
IOVEC_SET_STRING(iovec[tn], "_TRANSPORT=journal");
tn = n++;
IOVEC_SET_STRING(iovec[tn], "_TRANSPORT=journal");
+ entry_size += strlen("_TRANSPORT=journal");
+
+ if (entry_size + n + 1 > ENTRY_SIZE_MAX) { /* data + separators + trailer */
+ log_debug("Entry is too big with %u properties and %zu bytes, ignoring.",
+ n, entry_size);
+ goto finish;
+ }
if (message) {
if (s->forward_to_syslog)
if (message) {
if (s->forward_to_syslog)
@@
-265,6
+276,9
@@
void server_process_native_message(
if (s->forward_to_console)
server_forward_console(s, priority, identifier, message, ucred);
if (s->forward_to_console)
server_forward_console(s, priority, identifier, message, ucred);
+
+ if (s->forward_to_wall)
+ server_forward_wall(s, priority, identifier, message, ucred);
}
server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
}
server_dispatch_message(s, iovec, n, m, ucred, tv, label, label_len, NULL, priority, object_pid);
@@
-367,12
+381,15
@@
void server_process_native_file(
}
int server_open_native_socket(Server*s) {
}
int server_open_native_socket(Server*s) {
- union sockaddr_union sa;
int one, r;
assert(s);
if (s->native_fd < 0) {
int one, r;
assert(s);
if (s->native_fd < 0) {
+ union sockaddr_union sa = {
+ .un.sun_family = AF_UNIX,
+ .un.sun_path = "/run/systemd/journal/socket",
+ };
s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (s->native_fd < 0) {
s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (s->native_fd < 0) {
@@
-380,15
+397,11
@@
int server_open_native_socket(Server*s) {
return -errno;
}
return -errno;
}
- zero(sa);
- sa.un.sun_family = AF_UNIX;
- strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
-
unlink(sa.un.sun_path);
r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
unlink(sa.un.sun_path);
r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
- log_error("bind(
) failed: %m"
);
+ log_error("bind(
%s) failed: %m", sa.un.sun_path
);
return -errno;
}
return -errno;
}
@@
-404,7
+417,7
@@
int server_open_native_socket(Server*s) {
}
#ifdef HAVE_SELINUX
}
#ifdef HAVE_SELINUX
- if (
use_selinux
()) {
+ if (
mac_selinux_use
()) {
one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)
one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)