Fix: syscall_list_show NULL pointer deref

Also make sure the syscall listing index matches the bitmask.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 96d90c58c586a2affa6d46ed17c993c69bcb98cb..4eae6747f692c1149adbb5d52fef45a5b8e19ea0 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -1152,8 +1152,11 @@ int syscall_list_show(struct seq_file *m, void *p)
        ret = get_sc_table(entry, &table, &bitness);
        if (ret)
                return ret;
+       if (!entry->desc)
+               return 0;
        seq_printf(m,   "syscall { index = %lu; name = %s; bitness = %u; };\n",
-               entry - table,
+               table == sc_table ? entry - table :
+                       (entry - table) + ARRAY_SIZE(sc_table),
                entry->desc->name,
                bitness);
        return 0;