picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: properly handle if two session with identical loginuids are attempted to be created

Browse source
This commit is contained in:
Lennart Poettering 2011-06-24 22:55:39 +02:00
parent 0771475394
commit 21c390ccd1
3 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/logind-dbus.c
View file

@ -314,9 +314,53 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message, DBusMess
goto fail;
}
if (hashmap_get(m->sessions, id)) {
r = -EEXIST;
goto fail;
session = hashmap_get(m->sessions, id);
if (session) {
/* Session already exists, client is probably
* something like "su" which changes uid but
* is still the same audit session */
reply = dbus_message_new_method_return(message);
if (!reply) {
r = -ENOMEM;
goto fail;
}
/* Create a throw-away fd */
if (pipe(pipe_fds) < 0) {
r = -errno;
goto fail;
}
close_nointr_nofail(pipe_fds[0]);
pipe_fds[0] = -1;
p = session_bus_path(session);
if (!p) {
r = -ENOMEM;
goto fail;
}
b = dbus_message_append_args(
reply,
DBUS_TYPE_STRING, &session->id,
DBUS_TYPE_OBJECT_PATH, &p,
DBUS_TYPE_STRING, &session->user->runtime_path,
DBUS_TYPE_UNIX_FD, &pipe_fds[1],
DBUS_TYPE_INVALID);
free(p);
if (!b) {
r = -ENOMEM;
goto fail;
}
close_nointr_nofail(pipe_fds[1]);
*_reply = reply;
return 0;
}
} else {

1
src/logind.h
View file

@ -40,7 +40,6 @@
* subscribe to fd HUP
* D-Bus method: AttachDevice(seat, device);
* D-Bus method: PermitLinger(user, bool b);
* properly handle if two sessions with the same loginuid are attempted to be created
*
* non-local X11 server
* reboot/shutdown halt management

10
src/pam-module.c
View file

@ -457,10 +457,12 @@ _public_ PAM_EXTERN int pam_sm_open_session(
goto finish;
}
r = pam_set_data(handle, "systemd.session-fd", INT_TO_PTR(session_fd+1), NULL);
if (r != PAM_SUCCESS) {
pam_syslog(handle, LOG_ERR, "Failed to install session fd.");
return r;
if (session_fd >= 0) {
r = pam_set_data(handle, "systemd.session-fd", INT_TO_PTR(session_fd+1), NULL);
if (r != PAM_SUCCESS) {
pam_syslog(handle, LOG_ERR, "Failed to install session fd.");
return r;
}
}
session_fd = -1;