shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-08 05:57:26 +03:00
Code

systemd: Fix busctl crash on aarch64 when setting output table format

Browse Source 
The enum used for column names is integer type while table_set_display() is parsing
arguments on size_t alignment which may result in assert in table_set_display() if
the size between types missmatch. This patch cast the enums to size_t.
An alternative solution would be to change the table_set_display() function
arguments to unsigned type.
This commit is contained in:
Alin Popa 2020-02-14 09:33:43 +01:00 committed by Yu Watanabe
parent c315b79fb4
commit bec31cf5f0
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/busctl/busctl.c
View File

@ -212,9 +212,27 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
return log_error_errno(r, "Failed to set sort column: %m");
if (arg_show_machine)
r = table_set_display(table, COLUMN_NAME, COLUMN_PID, COLUMN_PROCESS, COLUMN_USER, COLUMN_CONNECTION, COLUMN_UNIT, COLUMN_SESSION, COLUMN_DESCRIPTION, COLUMN_MACHINE, (size_t) -1);
r = table_set_display(table, (size_t) COLUMN_NAME,
(size_t) COLUMN_PID,
(size_t) COLUMN_PROCESS,
(size_t) COLUMN_USER,
(size_t) COLUMN_CONNECTION,
(size_t) COLUMN_UNIT,
(size_t) COLUMN_SESSION,
(size_t) COLUMN_DESCRIPTION,
(size_t) COLUMN_MACHINE,
(size_t) -1);
else
r = table_set_display(table, COLUMN_NAME, COLUMN_PID, COLUMN_PROCESS, COLUMN_USER, COLUMN_CONNECTION, COLUMN_UNIT, COLUMN_SESSION, COLUMN_DESCRIPTION, (size_t) -1);
r = table_set_display(table, (size_t) COLUMN_NAME,
(size_t) COLUMN_PID,
(size_t) COLUMN_PROCESS,
(size_t) COLUMN_USER,
(size_t) COLUMN_CONNECTION,
(size_t) COLUMN_UNIT,
(size_t) COLUMN_SESSION,
(size_t) COLUMN_DESCRIPTION,
(size_t) -1);
if (r < 0)
return log_error_errno(r, "Failed to set columns to display: %m");