Update libgsystem, use it to set dirfd-relative xattrs on symlinks
This is a bit more efficient in that we're not walking full paths, and it helps avoid security/reliability issues if an attacker (or just a misbehaving process) has the ability to mutate paths in the middle.
This commit is contained in:
1 parent
0eb8c37ecb
commit
683a719b7e
3 files changed
+7
-10
No files matched your search
+1
-1
Submodule src/libgsystem updated: 8bf85b5db3...31cd0b96bb.
@@ -190,11 +190,10 @@ checkout_file_from_input_at (OstreeRepoCheckoutMode mode,
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Fall back to filename based setting here due to lack of lsetxattrat */
|
||||
if (xattrs)
|
||||
{
|
||||
gs_unref_object GFile *path = g_file_get_child (destination_parent, destination_name);
|
||||
if (!gs_file_set_all_xattrs (path, xattrs, cancellable, error))
|
||||
if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, destination_name,
|
||||
xattrs, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
@@ -260,8 +259,8 @@ checkout_file_unioning_from_input_at (OstreeRepoCheckoutMode mode,
|
||||
|
||||
if (xattrs)
|
||||
{
|
||||
gs_unref_object GFile *temp_path = g_file_get_child (destination_parent, temp_filename);
|
||||
if (!gs_file_set_all_xattrs (temp_path, xattrs, cancellable, error))
|
||||
if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, destination_name,
|
||||
xattrs, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,12 +87,10 @@ commit_loose_object_trusted (OstreeRepo *self,
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Sadly we can't use at-relative API for symlink xattrs
|
||||
* because there's no lsetxattrat.
|
||||
*/
|
||||
if (xattrs != NULL)
|
||||
{
|
||||
if (!gs_file_set_all_xattrs (temp_file, xattrs, cancellable, error))
|
||||
if (!gs_dfd_and_name_set_all_xattrs (self->tmp_dir_fd, temp_filename,
|
||||
xattrs, cancellable, error))
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user