Fix: hander negative get_syscall_nr return value

[lttng-modules.git] / lttng-statedump-impl.c

diff --git a/lttng-statedump-impl.c b/lttng-statedump-impl.c
index dad51ddaa25013f1bd5453aca4352854bd1ec6eb..656cebb26ba635fe141f0c7f0badde761be6b5a3 100644 (file)
--- a/lttng-statedump-impl.c
+++ b/lttng-statedump-impl.c
@@ -65,6 +65,7 @@
 #define CREATE_TRACE_POINTS
 #define TRACE_INCLUDE_PATH ../instrumentation/events/lttng-module
 #define TRACE_INCLUDE_FILE lttng-statedump
+#define LTTNG_INSTRUMENTATION
 #include "instrumentation/events/lttng-module/lttng-statedump.h"
 
 DEFINE_TRACE(lttng_statedump_block_device);
@@ -213,6 +214,18 @@ int lttng_enumerate_network_ip_interface(struct lttng_session *session)
 }
 #endif /* CONFIG_INET */
 
+#ifdef FD_ISSET        /* For old kernels lacking close_on_exec() */
+static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+{
+       return FD_ISSET(fd, fdt->close_on_exec);
+}
+#else
+static inline bool lttng_close_on_exec(int fd, const struct fdtable *fdt)
+{
+       return close_on_exec(fd, fdt);
+}
+#endif
+
 static
 int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
 {
@@ -236,7 +249,7 @@ int lttng_dump_one_fd(const void *p, struct file *file, unsigned int fd)
         * the lock is taken, but we are not aware whether this is
         * guaranteed or not, so play safe.
         */
-       if (fd < fdt->max_fds && test_bit(fd, fdt->close_on_exec))
+       if (fd < fdt->max_fds && lttng_close_on_exec(fd, fdt))
                flags |= O_CLOEXEC;
        if (IS_ERR(s)) {
                struct dentry *dentry = file->f_path.dentry;
@@ -378,6 +391,9 @@ int lttng_list_interrupts(struct lttng_session *session)
 }
 #endif
 
+/*
+ * Called with task lock held.
+ */
 static
 void lttng_statedump_process_ns(struct lttng_session *session,
                struct task_struct *p,
@@ -389,8 +405,18 @@ void lttng_statedump_process_ns(struct lttng_session *session,
        struct nsproxy *proxy;
        struct pid_namespace *pid_ns;
 
+       /*
+        * Back and forth on locking strategy within Linux upstream for nsproxy.
+        * See Linux upstream commit 728dba3a39c66b3d8ac889ddbe38b5b1c264aec3
+        * "namespaces: Use task_lock and not rcu to protect nsproxy"
+        * for details.
+        */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
        rcu_read_lock();
        proxy = task_nsproxy(p);
+#else /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
+       proxy = p->nsproxy;
+#endif /* #else #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
        if (proxy) {
                pid_ns = lttng_get_proxy_pid_ns(proxy);
                do {
@@ -402,7 +428,9 @@ void lttng_statedump_process_ns(struct lttng_session *session,
                trace_lttng_statedump_process_state(session,
                        p, type, mode, submode, status, NULL);
        }
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0))
        rcu_read_unlock();
+#endif /* #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)) */
 }
 
 static