summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-23 16:28:05 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-23 16:28:05 +0200
commit93240d3aba4611dd966c5b9f7368d20612211486 (patch)
treeb00bfed80c8ac4523424f1bdef1607f3c0513d4a /src/shared
parent81cef14fce9c64afed600614403ecae7cd79781d (diff)
coredump: never write more than the configured processing size limit to disk
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/copy.c25
-rw-r--r--src/shared/copy.h2
2 files changed, 22 insertions, 5 deletions
diff --git a/src/shared/copy.c b/src/shared/copy.c
index 7c3fab6901..ebd6699838 100644
--- a/src/shared/copy.c
+++ b/src/shared/copy.c
@@ -22,15 +22,27 @@
#include "util.h"
#include "copy.h"
-int copy_bytes(int fdf, int fdt) {
+int copy_bytes(int fdf, int fdt, off_t max_bytes) {
assert(fdf >= 0);
assert(fdt >= 0);
for (;;) {
char buf[PIPE_BUF];
ssize_t n, k;
+ size_t m;
- n = read(fdf, buf, sizeof(buf));
+ m = sizeof(buf);
+
+ if (max_bytes != (off_t) -1) {
+
+ if (max_bytes <= 0)
+ return -E2BIG;
+
+ if ((off_t) m > max_bytes)
+ m = (size_t) max_bytes;
+ }
+
+ n = read(fdf, buf, m);
if (n < 0)
return -errno;
if (n == 0)
@@ -42,6 +54,11 @@ int copy_bytes(int fdf, int fdt) {
return k;
if (k != n)
return errno ? -errno : -EIO;
+
+ if (max_bytes != (off_t) -1) {
+ assert(max_bytes >= n);
+ max_bytes -= n;
+ }
}
return 0;
@@ -84,7 +101,7 @@ static int fd_copy_regular(int df, const char *from, const struct stat *st, int
if (fdt < 0)
return -errno;
- r = copy_bytes(fdf, fdt);
+ r = copy_bytes(fdf, fdt, (off_t) -1);
if (r < 0) {
unlinkat(dt, to, 0);
return r;
@@ -262,7 +279,7 @@ int copy_file(const char *from, const char *to, int flags, mode_t mode) {
if (fdt < 0)
return -errno;
- r = copy_bytes(fdf, fdt);
+ r = copy_bytes(fdf, fdt, (off_t) -1);
if (r < 0) {
unlink(to);
return r;
diff --git a/src/shared/copy.h b/src/shared/copy.h
index 1d5e0adc53..0bf2598f60 100644
--- a/src/shared/copy.h
+++ b/src/shared/copy.h
@@ -23,4 +23,4 @@
int copy_file(const char *from, const char *to, int flags, mode_t mode);
int copy_tree(const char *from, const char *to, bool merge);
-int copy_bytes(int fdf, int fdt);
+int copy_bytes(int fdf, int fdt, off_t max_bytes);