* Return allocated session or else NULL.
*/
struct relay_session *session_create(const char *session_name,
- const char *hostname,
+ const char *hostname, const char *base_path,
uint32_t live_timer,
bool snapshot,
const lttng_uuid sessiond_uuid,
uint32_t minor)
{
int ret;
- struct relay_session *session;
+ struct relay_session *session = NULL;
+
+ if (session_name && strstr(session_name, ".")) {
+ ERR("Illegal character in session name: \"%s\"",
+ session_name);
+ goto error;
+ }
+ if (base_path && strstr(base_path, "../")) {
+ ERR("Invalid session base path walks up the path hierarchy: \"%s\"",
+ base_path);
+ goto error;
+ }
+ if (hostname && strstr(hostname, ".")) {
+ ERR("Invalid character in hostname: \"%s\"",
+ hostname);
+ goto error;
+ }
session = zmalloc(sizeof(*session));
if (!session) {
WARN("Hostname exceeds maximal allowed length");
goto error;
}
+ if (lttng_strncpy(session->base_path, base_path,
+ sizeof(session->base_path))) {
+ WARN("Base path exceeds maximal allowed length");
+ goto error;
+ }
+
session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
if (!session->ctf_traces_ht) {
goto error;