shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

lib/prune: Don't modify dirent->d_name in place

Browse Source 
Currently when I run `ostree prune` it hits a seg fault when the
hash_func is used (in this case g_str_hash) from the call stack
_ostree_repo_prune_tmp() -> g_hash_table_contains() ->
g_hash_table_lookup_node(). So the key, in this case dent->d_name, must
be corrupt in some way.

glnx_dirfd_iterator_next_dent() uses readdir() to get the dirent struct.
And according to the man page for readdir(3), "POSIX.1 explicitly notes
that this field should not be used as an lvalue" (in reference to
d_name). So this commit avoids modifying d_name in place and copies it
instead. This seems to avoid the seg fault.

Closes: #1627
Approved by: jlebon
This commit is contained in:
Matthew Leeds 2018-06-14 14:33:10 -07:00 committed by Atomic Bot
parent 677e181025
commit 7dc3e45b3a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libostree/ostree-repo-prune.c
View File

@ -153,26 +153,29 @@ _ostree_repo_prune_tmp (OstreeRepo *self,
size_t len;
gboolean has_sig_suffix = FALSE;
struct dirent *dent;
g_autofree gchar *d_name = NULL;
if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))
return FALSE;
if (dent == NULL)
break;
len = strlen (dent->d_name);
if (len > 4 && g_strcmp0 (dent->d_name + len - 4, ".sig") == 0)
/* dirent->d_name can't be modified directly; see `man 3 readdir` */
d_name = g_strdup (dent->d_name);
len = strlen (d_name);
if (len > 4 && g_strcmp0 (d_name + len - 4, ".sig") == 0)
{
has_sig_suffix = TRUE;
dent->d_name[len - 4] = '\0';
d_name[len - 4] = '\0';
}
if (!g_hash_table_contains (self->remotes, dent->d_name))
if (!g_hash_table_contains (self->remotes, d_name))
{
/* Restore the previous value to get the file name. */
if (has_sig_suffix)
dent->d_name[len - 4] = '.';
d_name[len - 4] = '.';
if (!glnx_unlinkat (dfd_iter.fd, dent->d_name, 0, error))
if (!glnx_unlinkat (dfd_iter.fd, d_name, 0, error))
return FALSE;
}
}