Revert "libxl: fix build on rather old systems"

This reverts commit 1bce5f9baf.

This situation should be handled by disabling the dm restrict
feature, not silently falling back to lower protection.

Also this #ifdeffery is bad style.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Ian Jackson authored and Wei Liu committed 2019-01-17 17:59:13 +00:00
1 parent 617da6a379
commit ba219192b1
1 file changed
+2 -14
+2 -14
View File
@@ -334,24 +334,12 @@ int libxl__local_dm_preexec_restrict(libxl__gc *gc)
unsigned i;
/* Unshare mount and IPC namespaces. These are unused by QEMU. */
r = unshare(CLONE_NEWNS);
r = unshare(CLONE_NEWNS | CLONE_NEWIPC);
if (r) {
LOGE(ERROR, "libxl: Mount namespace unshare failed");
LOGE(ERROR, "libxl: Mount and IPC namespace unfailed");
return ERROR_FAIL;
}
#ifndef CLONE_NEWIPC /* Available as of Linux 2.6.19 / glibc 2.8 */
# define CLONE_NEWIPC 0x08000000
#endif
r = unshare(CLONE_NEWIPC);
if (r) {
if (r && errno != EINVAL) {
LOGE(ERROR, "libxl: IPC namespace unshare failed");
return ERROR_FAIL;
}
LOG(WARN, "libxl: IPC namespace unshare unavailable");
}
/* Set various "easy" rlimits */
for (i = 0; rlimits[i].resource != RLIMIT_NLIMITS; i++) {
struct rlimit rlim;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.