shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 11:55:44 +03:00
Code

logind: fix session-device dbus notify

Browse Source 
Had this fix lying around here for some time. Thanks to missing
type-checking for va-args we passed in the actual major/minor values
instead of pointers to it. Fix it by saving the values on the stack first
and passing in the pointers.
This commit is contained in:
David Herrmann 2013-10-01 17:48:15 +02:00
parent ea52e2aee8
commit 081dfa852f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/login/logind-session-device.c
View File

@ -46,9 +46,13 @@ static void session_device_notify(SessionDevice *sd, enum SessionDeviceNotificat
_cleanup_dbus_message_unref_ DBusMessage *m = NULL;
_cleanup_free_ char *path = NULL;
const char *t = NULL;
uint32_t major, minor;
assert(sd);
major = major(sd->dev);
minor = minor(sd->dev);
if (!sd->session->controller)
return;
@ -68,8 +72,8 @@ static void session_device_notify(SessionDevice *sd, enum SessionDeviceNotificat
switch (type) {
case SESSION_DEVICE_RESUME:
if (!dbus_message_append_args(m,
DBUS_TYPE_UINT32, major(sd->dev),
DBUS_TYPE_UINT32, minor(sd->dev),
DBUS_TYPE_UINT32, &major,
DBUS_TYPE_UINT32, &minor,
DBUS_TYPE_UNIX_FD, &sd->fd,
DBUS_TYPE_INVALID))
return;
@ -88,8 +92,8 @@ static void session_device_notify(SessionDevice *sd, enum SessionDeviceNotificat
}
if (t && !dbus_message_append_args(m,
DBUS_TYPE_UINT32, major(sd->dev),
DBUS_TYPE_UINT32, minor(sd->dev),
DBUS_TYPE_UINT32, &major,
DBUS_TYPE_UINT32, &minor,
DBUS_TYPE_STRING, &t,
DBUS_TYPE_INVALID))
return;