annotate security/polkit/CVE-2018-19788.patch @ 602:705beca72ba0

vanilla: fix many meson based builds
author David Demelier <markand@malikania.fr>
date Sat, 13 Jul 2019 18:04:46 +0200
parents dbffca6c243e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
490
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- src/polkit/polkitunixgroup.c
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ src/polkit/polkitunixgroup.c
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -71,6 +71,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixGroup, polkit_unix_group, G_TYPE_OBJECT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 static void
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 polkit_unix_group_init (PolkitUnixGroup *unix_group)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 + unix_group->gid = -1; /* (git_t) -1 is not a valid GID under Linux */
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 }
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
9
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 static void
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 @@ -100,11 +101,14 @@ polkit_unix_group_set_property (GObject *object,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 GParamSpec *pspec)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 PolkitUnixGroup *unix_group = POLKIT_UNIX_GROUP (object);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 + gint val;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
16
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 switch (prop_id)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 case PROP_GID:
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 - unix_group->gid = g_value_get_int (value);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 + val = g_value_get_int (value);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 + g_return_if_fail (val != -1);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 + unix_group->gid = val;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 break;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
25
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 default:
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 @@ -131,9 +135,9 @@ polkit_unix_group_class_init (PolkitUnixGroupClass *klass)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 g_param_spec_int ("gid",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 "Group ID",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 "The UNIX group ID",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 - 0,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 + G_MININT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 G_MAXINT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 - 0,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 + -1,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 G_PARAM_CONSTRUCT |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 G_PARAM_READWRITE |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 G_PARAM_STATIC_NAME |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 @@ -166,9 +170,10 @@ polkit_unix_group_get_gid (PolkitUnixGroup *group)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 */
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 void
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 polkit_unix_group_set_gid (PolkitUnixGroup *group,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 - gint gid)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 + gint gid)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 g_return_if_fail (POLKIT_IS_UNIX_GROUP (group));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 + g_return_if_fail (gid != -1);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 group->gid = gid;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 }
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
50
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 @@ -183,6 +188,8 @@ polkit_unix_group_set_gid (PolkitUnixGroup *group,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 PolkitIdentity *
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 polkit_unix_group_new (gint gid)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 + g_return_val_if_fail (gid != -1, NULL);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 +
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_GROUP,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 "gid", gid,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 NULL));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 --- src/polkit/polkitunixprocess.c
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 +++ src/polkit/polkitunixprocess.c
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 @@ -159,9 +159,14 @@ polkit_unix_process_set_property (GObject *object,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 break;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
65
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 - case PROP_UID:
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 - polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 + case PROP_UID: {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
69 + gint val;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 +
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 + val = g_value_get_int (value);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 + g_return_if_fail (val != -1);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
73 + polkit_unix_process_set_uid (unix_process, val);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
74 break;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
75 + }
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
76
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
77 case PROP_START_TIME:
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
78 polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
79 @@ -239,7 +244,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
80 g_param_spec_int ("uid",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
81 "User ID",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
82 "The UNIX user ID",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
83 - -1,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
84 + G_MININT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
85 G_MAXINT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
86 -1,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
87 G_PARAM_CONSTRUCT |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
88 @@ -303,7 +308,6 @@ polkit_unix_process_set_uid (PolkitUnixProcess *process,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
89 gint uid)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
90 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
91 g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
92 - g_return_if_fail (uid >= -1);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
93 process->uid = uid;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
94 }
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
95
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
96 --- src/polkit/polkitunixuser.c
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
97 +++ src/polkit/polkitunixuser.c
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
98 @@ -72,6 +72,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixUser, polkit_unix_user, G_TYPE_OBJECT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
99 static void
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
100 polkit_unix_user_init (PolkitUnixUser *unix_user)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
101 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
102 + unix_user->uid = -1; /* (uid_t) -1 is not a valid UID under Linux */
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
103 unix_user->name = NULL;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
104 }
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
105
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
106 @@ -112,11 +113,14 @@ polkit_unix_user_set_property (GObject *object,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
107 GParamSpec *pspec)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
108 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
109 PolkitUnixUser *unix_user = POLKIT_UNIX_USER (object);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
110 + gint val;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
111
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
112 switch (prop_id)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
113 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
114 case PROP_UID:
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
115 - unix_user->uid = g_value_get_int (value);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
116 + val = g_value_get_int (value);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
117 + g_return_if_fail (val != -1);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
118 + unix_user->uid = val;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
119 break;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
120
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
121 default:
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
122 @@ -144,9 +148,9 @@ polkit_unix_user_class_init (PolkitUnixUserClass *klass)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
123 g_param_spec_int ("uid",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
124 "User ID",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
125 "The UNIX user ID",
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
126 - 0,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
127 + G_MININT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
128 G_MAXINT,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
129 - 0,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
130 + -1,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
131 G_PARAM_CONSTRUCT |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
132 G_PARAM_READWRITE |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
133 G_PARAM_STATIC_NAME |
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
134 @@ -182,6 +186,7 @@ polkit_unix_user_set_uid (PolkitUnixUser *user,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
135 gint uid)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
136 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
137 g_return_if_fail (POLKIT_IS_UNIX_USER (user));
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
138 + g_return_if_fail (uid != -1);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
139 user->uid = uid;
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
140 }
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
141
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
142 @@ -196,6 +201,8 @@ polkit_unix_user_set_uid (PolkitUnixUser *user,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
143 PolkitIdentity *
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
144 polkit_unix_user_new (gint uid)
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
145 {
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
146 + g_return_val_if_fail (uid != -1, NULL);
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
147 +
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
148 return POLKIT_IDENTITY (g_object_new (POLKIT_TYPE_UNIX_USER,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
149 "uid", uid,
dbffca6c243e security/polkit: initial import, closes #1578
David Demelier <markand@malikania.fr>
parents:
diff changeset
150 NULL));