packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update libglnx, port various bits to new API 

Using the error prefixing in the delta processing allows us to
do new code style.  Also strip trailing whitespace.

Use error prefixing in a few other random places.  I didn't
hunt for all of them, just testing out the new API.

Use `glnx_fchmod()`.  Also note I dropped one `fchmod (tmpf, 0600)`
which is no longer necessary.

Update submodule: libglnx

Closes: #1011
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-07-17 21:14:04 -04:00 committed by Atomic Bot
parent efd460782a
commit 2a9689b76a
10 changed files with 111 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit a37e672739197b8a7f3bdfe3f17099fe402f9a98
Subproject commit 607f1775bb1c626cae1875a957a34802daebe81c

12
src/libostree/ostree-core.c
View File

@ -26,6 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <gio/gfiledescriptorbased.h>
#include <gio/gunixinputstream.h>
#include "libglnx.h"
#include "ostree.h"
#include "ostree-core-private.h"
@ -740,15 +741,16 @@ ostree_content_file_parse_at (gboolean compressed,
GCancellable *cancellable,
GError **error)
{
g_autoptr(GInputStream) file_input = NULL;
if (!ot_openat_read_stream (parent_dfd, path, TRUE, &file_input,
cancellable, error))
return FALSE;
int glnx_fd_close fd = openat (parent_dfd, path, O_RDONLY | O_CLOEXEC);
if (fd < 0)
return glnx_throw_errno_prefix (error, "open(%s)", path);
struct stat stbuf;
if (!glnx_stream_fstat ((GFileDescriptorBased*)file_input, &stbuf, error))
if (!glnx_fstat (fd, &stbuf, error))
return FALSE;
g_autoptr(GInputStream) file_input = g_unix_input_stream_new (glnx_steal_fd (&fd), TRUE);
g_autoptr(GFileInfo) ret_file_info = NULL;
g_autoptr(GVariant) ret_xattrs = NULL;
g_autoptr(GInputStream) ret_input = NULL;

4
src/libostree/ostree-fetcher-soup.c
View File

@ -1337,8 +1337,10 @@ _ostree_fetcher_bytes_transferred (OstreeFetcher *self)
{
if (G_IS_FILE_DESCRIPTOR_BASED (stream))
{
int fd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*)stream);
struct stat stbuf;
if (glnx_stream_fstat ((GFileDescriptorBased*)stream, &stbuf, NULL))
if (glnx_fstat (fd, &stbuf, NULL))
ret += stbuf.st_size;
}
}

3
src/libostree/ostree-gpg-verifier.c
View File

@ -93,6 +93,7 @@ _ostree_gpg_verifier_check_signature (OstreeGpgVerifier *self,
GCancellable *cancellable,
GError **error)
{
GLNX_AUTO_PREFIX_ERROR("GPG", error);
gpgme_error_t gpg_error = 0;
ot_auto_gpgme_data gpgme_data_t data_buffer = NULL;
ot_auto_gpgme_data gpgme_data_t signature_buffer = NULL;
@ -253,8 +254,6 @@ out:
(void) glnx_shutil_rm_rf_at (AT_FDCWD, tmp_dir, NULL, NULL);
}
g_prefix_error (error, "GPG: ");
return result;
}

4
src/libostree/ostree-impl-system-generator.c
View File

@ -203,8 +203,8 @@ _ostree_impl_system_generator (const char *ostree_cmdline,
return FALSE;
g_clear_object (&outstream);
/* It should be readable */
if (fchmod (tmpf.fd, 0644) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!glnx_fchmod (tmpf.fd, 0644, error))
return FALSE;
/* Error out if somehow it already exists, that'll help us debug conflicts */
if (!glnx_link_tmpfile_at (&tmpf, GLNX_LINK_TMPFILE_NOREPLACE,
normal_dir_dfd, "var.mount", error))

4
src/libostree/ostree-repo-checkout.c
View File

@ -81,8 +81,8 @@ checkout_object_for_uncompressed_cache (OstreeRepo *self,
if (!g_output_stream_close (temp_out, cancellable, error))
return FALSE;
if (fchmod (tmpf.fd, file_mode) < 0)
return glnx_throw_errno (error);
if (!glnx_fchmod (tmpf.fd, file_mode, error))
return FALSE;
if (!_ostree_repo_ensure_loose_objdir_at (self->uncompressed_objects_dir_fd,
loose_path,

20
src/libostree/ostree-repo-commit.c
View File

@ -253,8 +253,8 @@ commit_loose_regfile_object (OstreeRepo *self,
if (S_ISREG (mode))
{
const mode_t content_mode = (mode & (S_IFREG | 0775)) | S_IRUSR;
if (fchmod (tmpf->fd, content_mode) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!glnx_fchmod (tmpf->fd, content_mode, error))
return FALSE;
}
else
g_assert (S_ISLNK (mode));
@ -266,8 +266,8 @@ commit_loose_regfile_object (OstreeRepo *self,
return glnx_throw (error, "Invalid mode 0%04o with bits 0%04o in bare-user-only repository",
mode, invalid_modebits);
if (fchmod (tmpf->fd, mode) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!glnx_fchmod (tmpf->fd, mode, error))
return FALSE;
}
if (_ostree_repo_mode_is_bare (self->mode))
@ -495,8 +495,8 @@ create_regular_tmpfile_linkable_with_content (OstreeRepo *self,
}
}
if (fchmod (tmpf.fd, 0644) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!glnx_fchmod (tmpf.fd, 0644, error))
return FALSE;
*out_tmpf = tmpf; tmpf.initialized = FALSE;
return TRUE;
@ -653,8 +653,8 @@ write_content_object (OstreeRepo *self,
if (!g_output_stream_flush (temp_out, cancellable, error))
return FALSE;
if (fchmod (tmpf.fd, 0644) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!glnx_fchmod (tmpf.fd, 0644, error))
return FALSE;
}
const char *actual_checksum = NULL;
@ -852,8 +852,8 @@ write_metadata_object (OstreeRepo *self,
return FALSE;
if (glnx_loop_write (tmpf.fd, bufp, len) < 0)
return glnx_throw_errno_prefix (error, "write()");
if (fchmod (tmpf.fd, 0644) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!glnx_fchmod (tmpf.fd, 0644, error))
return FALSE;
/* And commit it into place */
if (!_ostree_repo_commit_tmpf_final (self, actual_checksum, objtype,

9
src/libostree/ostree-repo-pull.c
View File

@ -1386,11 +1386,10 @@ process_verify_result (OtPullData *pull_data,
OstreeGpgVerifyResult *result,
GError **error)
{
const char *error_prefix = glnx_strjoina ("Commit ", checksum);
GLNX_AUTO_PREFIX_ERROR(error_prefix, error);
if (result == NULL)
{
g_prefix_error (error, "Commit %s: ", checksum);
return FALSE;
}
/* Allow callers to output the results immediately. */
g_signal_emit_by_name (pull_data->repo,
@ -1398,10 +1397,8 @@ process_verify_result (OtPullData *pull_data,
checksum, result);
if (!ostree_gpg_verify_result_require_valid_signature (result, error))
{
g_prefix_error (error, "Commit %s: ", checksum);
return FALSE;
}
return TRUE;
}

169
src/libostree/ostree-repo-static-delta-processing.c
View File

@ -127,26 +127,21 @@ open_output_target (StaticDeltaExecutionState *state,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
guint8 *objcsum;
g_assert (state->checksums != NULL);
g_assert (state->output_target == NULL);
g_assert (state->checksum_index < state->n_checksums);
objcsum = (guint8*)state->checksums + (state->checksum_index * OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN);
guint8 *objcsum = (guint8*)state->checksums + (state->checksum_index * OSTREE_STATIC_DELTA_OBJTYPE_CSUM_LEN);
if (G_UNLIKELY(!ostree_validate_structureof_objtype (*objcsum, error)))
goto out;
return FALSE;
state->output_objtype = (OstreeObjectType) *objcsum;
state->output_target = objcsum + 1;
ostree_checksum_inplace_from_bytes (state->output_target, state->checksum);
ret = TRUE;
out:
return ret;
return TRUE;
}
static guint
@ -410,18 +405,16 @@ do_content_open_generic (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
g_autoptr(GVariant) modev = NULL;
guint64 mode_offset;
guint64 xattr_offset;
guint32 uid, gid, mode;
if (!read_varuint64 (state, &mode_offset, error))
goto out;
return FALSE;
if (!read_varuint64 (state, &xattr_offset, error))
goto out;
return FALSE;
modev = g_variant_get_child_value (state->mode_dict, mode_offset);
g_autoptr(GVariant) modev = g_variant_get_child_value (state->mode_dict, mode_offset);
guint32 uid, gid, mode;
g_variant_get (modev, "(uuu)", &uid, &gid, &mode);
state->uid = GUINT32_FROM_BE (uid);
state->gid = GUINT32_FROM_BE (gid);
@ -429,9 +422,7 @@ do_content_open_generic (OstreeRepo *repo,
state->xattrs = g_variant_get_child_value (state->xattr_dict, xattr_offset);
ret = TRUE;
out:
return ret;
return TRUE;
}
struct bzpatch_opaque_s
@ -460,35 +451,29 @@ dispatch_bspatch (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
guint64 offset, length;
g_autoptr(GMappedFile) input_mfile = NULL;
g_autofree guchar *buf = NULL;
struct bspatch_stream stream;
struct bzpatch_opaque_s opaque;
if (!read_varuint64 (state, &offset, error))
goto out;
return FALSE;
if (!read_varuint64 (state, &length, error))
goto out;
return FALSE;
if (state->stats_only)
{
ret = TRUE;
goto out;
}
return TRUE; /* Early return */
if (!state->have_obj)
{
input_mfile = g_mapped_file_new_from_fd (state->read_source_fd, FALSE, error);
g_autoptr(GMappedFile) input_mfile = g_mapped_file_new_from_fd (state->read_source_fd, FALSE, error);
if (!input_mfile)
goto out;
return FALSE;
buf = g_malloc0 (state->content_size);
g_autofree guchar *buf = g_malloc0 (state->content_size);
struct bzpatch_opaque_s opaque;
opaque.state = state;
opaque.offset = offset;
opaque.length = length;
struct bspatch_stream stream;
stream.read = bspatch_read;
stream.opaque = &opaque;
if (bspatch ((const guint8*)g_mapped_file_get_contents (input_mfile),
@ -496,16 +481,14 @@ dispatch_bspatch (OstreeRepo *repo,
buf,
state->content_size,
&stream) < 0)
goto out;
return FALSE;
if (!content_out_write (repo, state, buf, state->content_size,
cancellable, error))
goto out;
return FALSE;
}
ret = TRUE;
out:
return ret;
return TRUE;
}
/* Before, we had a distinction between "trusted" and "untrusted" deltas
@ -679,7 +662,7 @@ dispatch_open (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
GLNX_AUTO_PREFIX_ERROR("opcode open", error);
g_assert (state->output_target == NULL);
/* FIXME - lift this restriction */
@ -691,37 +674,30 @@ dispatch_open (OstreeRepo *repo,
}
if (!open_output_target (state, cancellable, error))
goto out;
return FALSE;
if (!do_content_open_generic (repo, state, cancellable, error))
goto out;
return FALSE;
if (!read_varuint64 (state, &state->content_size, error))
goto out;
return FALSE;
if (state->stats_only)
{
ret = TRUE;
goto out;
}
return TRUE; /* Early return */
if (!_ostree_repo_open_content_bare (repo, state->checksum,
state->content_size,
&state->tmpf,
&state->have_obj,
cancellable, error))
goto out;
return FALSE;
if (!state->have_obj)
state->content_out = g_unix_output_stream_new (state->tmpf.fd, FALSE);
if (!handle_untrusted_content_checksum (repo, state, cancellable, error))
goto out;
return FALSE;
ret = TRUE;
out:
if (!ret)
g_prefix_error (error, "opcode open: ");
return ret;
return TRUE;
}
static gboolean
@ -730,30 +706,24 @@ dispatch_write (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
GLNX_AUTO_PREFIX_ERROR("opcode open-splice-and-close", error);
guint64 content_size;
guint64 content_offset;
if (!read_varuint64 (state, &content_size, error))
goto out;
return FALSE;
if (!read_varuint64 (state, &content_offset, error))
goto out;
return FALSE;
if (state->stats_only)
{
ret = TRUE;
goto out;
}
return TRUE; /* Early return */
if (!state->have_obj)
{
if (state->read_source_fd != -1)
{
if (lseek (state->read_source_fd, content_offset, SEEK_SET) == -1)
{
glnx_set_error_from_errno (error);
goto out;
}
return glnx_throw_errno_prefix (error, "lseek");
while (content_size > 0)
{
char buf[4096];
@ -763,20 +733,13 @@ dispatch_write (OstreeRepo *repo,
bytes_read = read (state->read_source_fd, buf, MIN(sizeof(buf), content_size));
while (G_UNLIKELY (bytes_read == -1 && errno == EINTR));
if (bytes_read == -1)
{
glnx_set_error_from_errno (error);
goto out;
}
return glnx_throw_errno_prefix (error, "read");
if (G_UNLIKELY (bytes_read == 0))
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Unexpected EOF reading object %s", state->read_source_object);
goto out;
}
return glnx_throw (error, "Unexpected EOF reading object %s", state->read_source_object);
if (!content_out_write (repo, state, (guint8*)buf, bytes_read,
cancellable, error))
goto out;
return FALSE;
content_size -= bytes_read;
}
@ -784,19 +747,15 @@ dispatch_write (OstreeRepo *repo,
else
{
if (!validate_ofs (state, content_offset, content_size, error))
goto out;
return FALSE;
if (!content_out_write (repo, state, state->payload_data + content_offset, content_size,
cancellable, error))
goto out;
return FALSE;
}
}
ret = TRUE;
out:
if (!ret)
g_prefix_error (error, "opcode open-splice-and-close: ");
return ret;
return TRUE;
}
static gboolean
@ -805,7 +764,7 @@ dispatch_set_read_source (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
GLNX_AUTO_PREFIX_ERROR("opcode set-read-source", error);
guint64 source_offset;
if (state->read_source_fd != -1)
@ -815,15 +774,12 @@ dispatch_set_read_source (OstreeRepo *repo,
}
if (!read_varuint64 (state, &source_offset, error))
goto out;
return FALSE;
if (!validate_ofs (state, source_offset, 32, error))
goto out;
return FALSE;
if (state->stats_only)
{
ret = TRUE;
goto out;
}
return TRUE; /* Early return */
g_free (state->read_source_object);
state->read_source_object = ostree_checksum_from_bytes (state->payload_data + source_offset);
@ -832,13 +788,9 @@ dispatch_set_read_source (OstreeRepo *repo,
&state->read_source_fd,
NULL, NULL, NULL,
cancellable, error))
goto out;
return FALSE;
ret = TRUE;
out:
if (!ret)
g_prefix_error (error, "opcode set-read-source: ");
return ret;
return TRUE;
}
static gboolean
@ -847,13 +799,10 @@ dispatch_unset_read_source (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
GLNX_AUTO_PREFIX_ERROR("opcode unset-read-source", error);
if (state->stats_only)
{
ret = TRUE;
goto out;
}
return TRUE; /* Early return */
if (state->read_source_fd != -1)
{
@ -863,11 +812,7 @@ dispatch_unset_read_source (OstreeRepo *repo,
g_clear_pointer (&state->read_source_object, g_free);
ret = TRUE;
out:
if (!ret)
g_prefix_error (error, "opcode unset-read-source: ");
return ret;
return TRUE;
}
static gboolean
@ -876,36 +821,32 @@ dispatch_close (OstreeRepo *repo,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
GLNX_AUTO_PREFIX_ERROR("opcode open-splice-and-close", error);
if (state->content_out)
{
if (!g_output_stream_flush (state->content_out, cancellable, error))
goto out;
return FALSE;
if (state->content_checksum)
{
const char *actual_checksum = g_checksum_get_string (state->content_checksum);
if (strcmp (actual_checksum, state->checksum) != 0)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Corrupted object %s (actual checksum is %s)",
return glnx_throw (error, "Corrupted object %s (actual checksum is %s)",
state->checksum, actual_checksum);
goto out;
}
}
if (!_ostree_repo_commit_trusted_content_bare (repo, state->checksum, &state->tmpf,
state->uid, state->gid, state->mode,
state->xattrs,
cancellable, error))
goto out;
return FALSE;
g_clear_object (&state->content_out);
}
if (!dispatch_unset_read_source (repo, state, cancellable, error))
goto out;
return FALSE;
g_clear_pointer (&state->xattrs, g_variant_unref);
g_clear_pointer (&state->content_checksum, g_checksum_free);
@ -913,9 +854,5 @@ dispatch_close (OstreeRepo *repo,
state->checksum_index++;
state->output_target = NULL;
ret = TRUE;
out:
if (!ret)
g_prefix_error (error, "opcode open-splice-and-close: ");
return ret;
return TRUE;
}

2
src/libostree/ostree-repo.c
View File

@ -1753,8 +1753,6 @@ ostree_repo_create (OstreeRepo *self,
if (!glnx_open_tmpfile_linkable_at (dfd, ".", O_RDWR|O_CLOEXEC, &tmpf, error))
return FALSE;
if (fchmod (tmpf.fd, 0600) < 0)
return glnx_throw_errno_prefix (error, "fchmod");
if (!_ostree_write_bareuser_metadata (tmpf.fd, 0, 0, 644, NULL, error))
return FALSE;
}