common/Seccomp.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit b4b777d9d68caf75bf834f7ee5316757faf4a56c
Author: Jan Holesovsky <ke...@collabora.com>
Date: Fri Oct 6 15:42:53 2017 +0200
rlimits: The fsize and nofile need more tweaking...
Change-Id: Ifdb4d24f103f54fd286b8ffa715c0a61c2cff94f
Reviewed-on: https://gerrit.libreoffice.org/43201
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/common/Seccomp.cpp b/common/Seccomp.cpp
index e46d2eb8..9dbb5f9f 100644
--- a/common/Seccomp.cpp
+++ b/common/Seccomp.cpp
@@ -268,6 +268,10 @@ bool handleSetrlimitCommand(const
std::vector<std::string>& tokens)
if (lim <= 0)
lim = RLIM_INFINITY;
+ /* FIXME Currently the RLIMIT_FSIZE handling is non-ideal, and can
+ * lead to crashes of the kit processes due to not handling signal
+ * 25 gracefully. Let's disable for now before there's a more
+ * concrete plan.
rlimit rlim = { lim, lim };
if (setrlimit(RLIMIT_FSIZE, &rlim) != 0)
LOG_SYS("Failed to set RLIMIT_FSIZE to " << lim << " bytes.");
@@ -276,6 +280,8 @@ bool handleSetrlimitCommand(const std::vector<std::string>&
tokens)
LOG_INF("RLIMIT_FSIZE is " << rlim.rlim_max << " bytes after
setting it to " << lim << " bytes.");
else
LOG_SYS("Failed to get RLIMIT_FSIZE.");
+ */
+ LOG_SYS("Ignored setting RLIMIT_FSIZE to " << lim << " bytes.");
return true;
}
@@ -285,14 +291,19 @@ bool handleSetrlimitCommand(const
std::vector<std::string>& tokens)
if (lim <= 0)
lim = RLIM_INFINITY;
+ /* FIXME Currently the RLIMIT_ is non-ideal, and can lead to
+ * problems. Let's disable for now before there's a more
+ * concrete plan.
rlimit rlim = { lim, lim };
if (setrlimit(RLIMIT_NOFILE, &rlim) != 0)
- LOG_SYS("Failed to set RLIMIT_NOFILE to " << lim << " bytes.");
+ LOG_SYS("Failed to set RLIMIT_NOFILE to " << lim << " files.");
if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)
LOG_INF("RLIMIT_NOFILE is " << rlim.rlim_max << " files after
setting it to " << lim << " files.");
else
LOG_SYS("Failed to get RLIMIT_NOFILE.");
+ */
+ LOG_SYS("Ignored setting RLIMIT_NOFILE to " << lim << " files.");
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
