You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/10/31 23:03:46 UTC
svn commit: r1635870 - in /subversion/trunk/subversion/libsvn_fs_x: ./
cached_data.c fs_x.c id.c id.h index.c low_level.c tree.c util.c verify.c
Author: stefan2
Date: Fri Oct 31 22:03:45 2014
New Revision: 1635870
URL: http://svn.apache.org/r1635870
Log:
Sync FSX with FSFS: Merge revisions
r1603605, r1606840, r1622931, r1622937, r1622942, r1622959, r1622963,
r1622987, r1623373, r1623398, r1628392, r1628427, r1631196, r1631197,
r1631240, r1631548, r1631550 and r1633617 from libsvn_fs_fs and resolve
the usual text conflicts with FSX.
This ports the "parser hardening" patches to FSX.
Modified:
subversion/trunk/subversion/libsvn_fs_x/ (props changed)
subversion/trunk/subversion/libsvn_fs_x/cached_data.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/id.c
subversion/trunk/subversion/libsvn_fs_x/id.h
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/subversion/libsvn_fs_x/low_level.c
subversion/trunk/subversion/libsvn_fs_x/tree.c
subversion/trunk/subversion/libsvn_fs_x/util.c
subversion/trunk/subversion/libsvn_fs_x/verify.c
Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/libsvn_fs_fs:r1603605,1606840,1622931,1622937,1622942,1622959,1622963,1622987,1623373,1623398,1628392,1628427,1631196-1631197,1631240,1631548,1631550,1633617
Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Fri Oct 31 22:03:45 2014
@@ -2509,7 +2509,7 @@ read_dir_entries(apr_array_header_t *ent
_("Directory entry corrupt in '%s'"),
svn_fs_x__id_unparse(id, scratch_pool)->data);
- dirent->id = svn_fs_x__id_parse(str, result_pool);
+ SVN_ERR(svn_fs_x__id_parse(&dirent->id, str, result_pool));
/* In incremental mode, update the hash; otherwise, write to the
* final array. */
@@ -2876,30 +2876,51 @@ block_read_contents(svn_fs_t *fs,
return SVN_NO_ERROR;
}
+/* For the given REV_FILE in FS, in *STREAM return a stream covering the
+ * item specified by ENTRY. Also, verify the item's content by low-level
+ * checksum. Allocate the result in POOL.
+ */
static svn_error_t *
-auto_select_stream(svn_stream_t **stream,
- svn_fs_t *fs,
- svn_fs_x__revision_file_t *rev_file,
- svn_fs_x__p2l_entry_t* entry,
- apr_pool_t *pool)
-{
- fs_x_data_t *ffd = fs->fsap_data;
+read_item(svn_stream_t **stream,
+ svn_fs_t *fs,
+ svn_fs_x__revision_file_t *rev_file,
+ svn_fs_x__p2l_entry_t* entry,
+ apr_pool_t *pool)
+{
+ apr_uint32_t digest;
+ svn_checksum_t *expected, *actual;
+ apr_uint32_t plain_digest;
+
+ /* Read item into string buffer. */
+ svn_stringbuf_t *text = svn_stringbuf_create_ensure(entry->size, pool);
+ text->len = entry->size;
+ text->data[text->len] = 0;
+ SVN_ERR(svn_io_file_read_full2(rev_file->file, text->data, text->len,
+ NULL, NULL, pool));
+
+ /* Return (construct, calculate) stream and checksum. */
+ *stream = svn_stream_from_stringbuf(text, pool);
+ digest = svn__fnv1a_32x4(text->data, text->len);
- if (((entry->offset + entry->size) ^ entry->offset) >= ffd->block_size)
- {
- svn_stringbuf_t *text = svn_stringbuf_create_ensure(entry->size, pool);
- text->len = entry->size;
- text->data[text->len] = 0;
- SVN_ERR(svn_io_file_read_full2(rev_file->file, text->data, text->len,
- NULL, NULL, pool));
- *stream = svn_stream_from_stringbuf(text, pool);
- }
- else
- {
- *stream = rev_file->stream;
- }
+ /* Checksums will match most of the time. */
+ if (entry->fnv1_checksum == digest)
+ return SVN_NO_ERROR;
- return SVN_NO_ERROR;
+ /* Construct proper checksum objects from their digests to allow for
+ * nice error messages. */
+ plain_digest = htonl(entry->fnv1_checksum);
+ expected = svn_checksum__from_digest_fnv1a_32x4(
+ (const unsigned char *)&plain_digest, pool);
+ plain_digest = htonl(digest);
+ actual = svn_checksum__from_digest_fnv1a_32x4(
+ (const unsigned char *)&plain_digest, pool);
+
+ /* Construct the full error message with all the info we have. */
+ return svn_checksum_mismatch_err(expected, actual, pool,
+ _("Low-level checksum mismatch while reading\n"
+ "%s bytes of meta data at offset %s "),
+ apr_psprintf(pool, "%" APR_OFF_T_FMT, entry->size),
+ apr_psprintf(pool, "%" APR_OFF_T_FMT, entry->offset));
}
/* Read all txdelta / plain windows following REP_HEADER in FS as described
@@ -2936,7 +2957,7 @@ block_read_changes(apr_array_header_t **
return SVN_NO_ERROR;
}
- SVN_ERR(auto_select_stream(&stream, fs, rev_file, entry, scratch_pool));
+ SVN_ERR(read_item(&stream, fs, rev_file, entry, scratch_pool));
/* read changes from revision file */
@@ -2990,7 +3011,7 @@ block_read_changes_container(apr_array_h
return SVN_NO_ERROR;
}
- SVN_ERR(auto_select_stream(&stream, fs, rev_file, entry, scratch_pool));
+ SVN_ERR(read_item(&stream, fs, rev_file, entry, scratch_pool));
/* read changes from revision file */
@@ -3038,7 +3059,7 @@ block_read_noderev(node_revision_t **nod
return SVN_NO_ERROR;
}
- SVN_ERR(auto_select_stream(&stream, fs, rev_file, entry, scratch_pool));
+ SVN_ERR(read_item(&stream, fs, rev_file, entry, scratch_pool));
/* read node rev from revision file */
@@ -3084,15 +3105,13 @@ block_read_noderevs_container(node_revis
return SVN_NO_ERROR;
}
- SVN_ERR(auto_select_stream(&stream, fs, rev_file, entry, scratch_pool));
+ SVN_ERR(read_item(&stream, fs, rev_file, entry, scratch_pool));
/* read noderevs from revision file */
-
SVN_ERR(svn_fs_x__read_noderevs_container(&container, stream, scratch_pool,
scratch_pool));
/* extract requested data */
-
if (must_read)
SVN_ERR(svn_fs_x__noderevs_get(noderev_p, container, sub_item,
result_pool));
@@ -3133,10 +3152,9 @@ block_read_reps_container(svn_fs_x__rep_
return SVN_NO_ERROR;
}
- SVN_ERR(auto_select_stream(&stream, fs, rev_file, entry, scratch_pool));
+ SVN_ERR(read_item(&stream, fs, rev_file, entry, scratch_pool));
/* read noderevs from revision file */
-
SVN_ERR(svn_fs_x__read_reps_container(&container, stream, result_pool,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.c Fri Oct 31 22:03:45 2014
@@ -201,6 +201,49 @@ get_youngest(svn_revnum_t *youngest_p,
return SVN_NO_ERROR;
}
+/* Check that BLOCK_SIZE is a valid block / page size, i.e. it is within
+ * the range of what the current system may address in RAM and it is a
+ * power of 2. Assume that the element size within the block is ITEM_SIZE.
+ * Use SCRATCH_POOL for temporary allocations.
+ */
+static svn_error_t *
+verify_block_size(apr_int64_t block_size,
+ apr_size_t item_size,
+ const char *name,
+ apr_pool_t *scratch_pool
+ )
+{
+ /* Limit range. */
+ if (block_size <= 0)
+ return svn_error_createf(SVN_ERR_BAD_CONFIG_VALUE, NULL,
+ _("%s is too small for fsfs.conf setting '%s'."),
+ apr_psprintf(scratch_pool,
+ "%" APR_INT64_T_FMT,
+ block_size),
+ name);
+
+ if (block_size > SVN_MAX_OBJECT_SIZE / item_size)
+ return svn_error_createf(SVN_ERR_BAD_CONFIG_VALUE, NULL,
+ _("%s is too large for fsfs.conf setting '%s'."),
+ apr_psprintf(scratch_pool,
+ "%" APR_INT64_T_FMT,
+ block_size),
+ name);
+
+ /* Ensure it is a power of two.
+ * For positive X, X & (X-1) will reset the lowest bit set.
+ * If the result is 0, at most one bit has been set. */
+ if (0 != (block_size & (block_size - 1)))
+ return svn_error_createf(SVN_ERR_BAD_CONFIG_VALUE, NULL,
+ _("%s is invalid for fsfs.conf setting '%s' "
+ "because it is not a power of 2."),
+ apr_psprintf(scratch_pool,
+ "%" APR_INT64_T_FMT,
+ block_size),
+ name);
+
+ return SVN_NO_ERROR;
+}
/* Read the configuration information of the file system at FS_PATH
* and set the respective values in FFD. Use pools as usual.
@@ -268,6 +311,17 @@ read_config(fs_x_data_t *ffd,
CONFIG_OPTION_P2L_PAGE_SIZE,
0x400));
+ /* Don't accept unreasonable or illegal values.
+ * Block size and P2L page size are in kbytes;
+ * L2P blocks are arrays of apr_off_t. */
+ SVN_ERR(verify_block_size(ffd->block_size, 0x400,
+ CONFIG_OPTION_BLOCK_SIZE, scratch_pool));
+ SVN_ERR(verify_block_size(ffd->p2l_page_size, 0x400,
+ CONFIG_OPTION_P2L_PAGE_SIZE, scratch_pool));
+ SVN_ERR(verify_block_size(ffd->l2p_page_size, sizeof(apr_off_t),
+ CONFIG_OPTION_L2P_PAGE_SIZE, scratch_pool));
+
+ /* convert kBytes to bytes */
ffd->block_size *= 0x400;
ffd->p2l_page_size *= 0x400;
@@ -439,19 +493,14 @@ write_config(svn_fs_t *fs,
"# " CONFIG_OPTION_BLOCK_SIZE " = 64" NL
"###" NL
"### The log-to-phys index maps data item numbers to offsets within the" NL
-"### rev or pack file. A revision typically contains 2 .. 5 such items" NL
-"### per changed path. For each revision, at least one page is being" NL
-"### allocated in the l2p index with unused parts resulting in no wasted" NL
-"### space." NL
-"### Changing this parameter only affects larger revisions with thousands" NL
-"### of changed paths. A smaller value means that more pages need to be" NL
-"### allocated for such revisions, increasing the size of the page table" NL
-"### meaning it takes longer to read that table (once). Access to each" NL
-"### page is then faster because less data has to read. So, if you have" NL
-"### several extremely large revisions (approaching 1 mio changes), think" NL
+"### rev or pack file. This index is organized in pages of a fixed maximum" NL
+"### capacity. To access an item, the page table and the respective page" NL
+"### must be read." NL
+"### This parameter only affects revisions with thousands of changed paths." NL
+"### If you have several extremely large revisions (~1 mio changes), think" NL
"### about increasing this setting. Reducing the value will rarely result" NL
"### in a net speedup." NL
-"### This is an expert setting. Any non-zero value is possible." NL
+"### This is an expert setting. Must be a power of 2." NL
"### l2p-page-size is 8192 entries by default." NL
"# " CONFIG_OPTION_L2P_PAGE_SIZE " = 8192" NL
"###" NL
@@ -460,7 +509,7 @@ write_config(svn_fs_t *fs,
"### stored at any particular offset. The index describes the rev file" NL
"### in chunks (pages) and keeps a global list of all those pages. Large" NL
"### pages mean a shorter page table but a larger per-page description of" NL
-"### data items in it. The latency sweetspot depends on the change size" NL
+"### data items in it. The latency sweet spot depends on the change size" NL
"### distribution but covers a relatively wide range." NL
"### If the repository contains very large files, i.e. individual changes" NL
"### of tens of MB each, increasing the page size will shorten the index" NL
Modified: subversion/trunk/subversion/libsvn_fs_x/id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/id.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/id.c Fri Oct 31 22:03:45 2014
@@ -394,10 +394,11 @@ svn_fs_x__id_copy(const svn_fs_id_t *sou
return (svn_fs_id_t *)new_id;
}
-
-svn_fs_id_t *
-svn_fs_x__id_parse(char *data,
- apr_pool_t *pool)
+/* Return an ID resulting from parsing the string DATA, or NULL if DATA is
+ an invalid ID string. *DATA will be modified / invalidated by this call. */
+static svn_fs_id_t *
+id_parse(char *data,
+ apr_pool_t *pool)
{
fs_x__id_t *id;
char *str;
@@ -439,6 +440,21 @@ svn_fs_x__id_parse(char *data,
return (svn_fs_id_t *)id;
}
+svn_error_t *
+svn_fs_x__id_parse(const svn_fs_id_t **id_p,
+ char *data,
+ apr_pool_t *pool)
+{
+ svn_fs_id_t *id = id_parse(data, pool);
+ if (id == NULL)
+ return svn_error_createf(SVN_ERR_FS_MALFORMED_NODEREV_ID, NULL,
+ "Malformed node revision ID string");
+
+ *id_p = id;
+
+ return SVN_NO_ERROR;
+}
+
/* (de-)serialization support */
/* Serialize an ID within the serialization CONTEXT.
Modified: subversion/trunk/subversion/libsvn_fs_x/id.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/id.h?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/id.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/id.h Fri Oct 31 22:03:45 2014
@@ -161,10 +161,13 @@ svn_fs_id_t *svn_fs_x__id_create(const s
svn_fs_id_t *svn_fs_x__id_copy(const svn_fs_id_t *id,
apr_pool_t *pool);
-/* Return an ID resulting from parsing the string DATA, or NULL if DATA is
- an invalid ID string. *DATA will be modified / invalidated by this call. */
-svn_fs_id_t *svn_fs_x__id_parse(char *data,
- apr_pool_t *pool);
+/* Return an ID in *ID_P resulting from parsing the string DATA, or an error
+ if DATA is an invalid ID string. *DATA will be modified / invalidated by
+ this call. */
+svn_error_t *
+svn_fs_x__id_parse(const svn_fs_id_t **id_p,
+ char *data,
+ apr_pool_t *pool);
/* (de-)serialization support*/
Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Fri Oct 31 22:03:45 2014
@@ -1298,6 +1298,13 @@ get_l2p_page(l2p_page_t **page,
}
}
+ /* After reading all page entries, the read cursor must have moved by
+ * TABLE_ENTRY->SIZE bytes. */
+ if ( packed_stream_offset(rev_file->l2p_stream)
+ != table_entry->offset + table_entry->size)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("L2P actual page size does not match page table value."));
+
*page = result;
return SVN_NO_ERROR;
@@ -2231,8 +2238,8 @@ get_p2l_header(p2l_header_t **header,
return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
_("P2L page count does not match rev / pack file size"));
- result->offsets
- = apr_pcalloc(result_pool, (result->page_count + 1) * sizeof(*result->offsets));
+ result->offsets = apr_pcalloc(result_pool, (result->page_count + 1)
+ * sizeof(*result->offsets));
/* read page sizes and derive page description offsets from them */
result->offsets[0] = 0;
@@ -2314,9 +2321,31 @@ read_entry(svn_fs_x__packed_number_strea
SVN_ERR(packed_stream_get(&value, stream));
entry.type = (int)value % 16;
entry.item_count = (apr_uint32_t)(value / 16);
+
+ /* Verify item type. */
+ if (entry.type > SVN_FS_X__ITEM_TYPE_REPS_CONT)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("Invalid item type in P2L index"));
+
SVN_ERR(packed_stream_get(&value, stream));
entry.fnv1_checksum = (apr_uint32_t)value;
+ /* Truncating the checksum to 32 bits may have hidden random data in the
+ * unused extra bits of the on-disk representation (7/8 bit representation
+ * uses 5 bytes on disk for the 32 bit value, leaving 3 bits unused). */
+ if (value > APR_UINT32_MAX)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("Invalid FNV1 checksum in P2L index"));
+
+ /* Some of the index data for empty rev / pack file sections will not be
+ * used during normal operation. Thus, we have strict rules for the
+ * contents of those unused fields. */
+ if (entry.type == SVN_FS_X__ITEM_TYPE_UNUSED)
+ if ( entry.fnv1_checksum != 0
+ || entry.item_count != 0)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("Unused regions must be empty and have checksum 0"));
+
if (entry.item_count == 0)
{
entry.items = NULL;
@@ -2326,6 +2355,11 @@ read_entry(svn_fs_x__packed_number_strea
entry.items
= apr_pcalloc(result->pool, entry.item_count * sizeof(*entry.items));
+ if ( entry.item_count > 1
+ && entry.type < SVN_FS_X__ITEM_TYPE_CHANGES_CONT)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("Only containers may have more than one sub-item"));
+
for (sub_item = 0; sub_item < entry.item_count; ++sub_item)
{
SVN_ERR(packed_stream_get(&value, stream));
@@ -2339,6 +2373,12 @@ read_entry(svn_fs_x__packed_number_strea
SVN_ERR(packed_stream_get(&value, stream));
number += value % 2 ? -1 - value / 2 : value / 2;
entry.items[sub_item].number = number;
+
+ if ( ( entry.type == SVN_FS_X__ITEM_TYPE_CHANGES
+ || entry.type == SVN_FS_X__ITEM_TYPE_CHANGES_CONT)
+ && number != SVN_FS_X__ITEM_INDEX_CHANGES)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("Changed path list must have item number 1"));
}
}
@@ -2381,23 +2421,40 @@ get_p2l_page(apr_array_header_t **entrie
SVN_ERR(packed_stream_get(&value, rev_file->p2l_stream));
item_offset = (apr_off_t)value;
- /* read all entries of this page */
- do
+ /* Special case: empty pages. */
+ if (start_offset == next_offset)
{
+ /* Empty page. This only happens if the first entry of the next page
+ * also covers this page (and possibly more) completely. */
SVN_ERR(read_entry(rev_file->p2l_stream, &item_offset, start_revision,
result));
- offset = packed_stream_offset(rev_file->p2l_stream);
}
- while (offset < next_offset);
-
- /* if we haven't covered the cluster end yet, we must read the first
- * entry of the next page */
- if (item_offset < page_start + page_size)
+ else
{
- SVN_ERR(packed_stream_get(&value, rev_file->p2l_stream));
- item_offset = (apr_off_t)value;
- SVN_ERR(read_entry(rev_file->p2l_stream, &item_offset, start_revision,
- result));
+ /* Read non-empty page. */
+ do
+ {
+ SVN_ERR(read_entry(rev_file->p2l_stream, &item_offset,
+ start_revision, result));
+ offset = packed_stream_offset(rev_file->p2l_stream);
+ }
+ while (offset < next_offset);
+
+ /* We should now be exactly at the next offset, i.e. the numbers in
+ * the stream cannot overlap into the next page description. */
+ if (offset != next_offset)
+ return svn_error_create(SVN_ERR_FS_INDEX_CORRUPTION, NULL,
+ _("P2L page description overlaps with next page description"));
+
+ /* if we haven't covered the cluster end yet, we must read the first
+ * entry of the next page */
+ if (item_offset < page_start + page_size)
+ {
+ SVN_ERR(packed_stream_get(&value, rev_file->p2l_stream));
+ item_offset = (apr_off_t)value;
+ SVN_ERR(read_entry(rev_file->p2l_stream, &item_offset,
+ start_revision, result));
+ }
}
*entries = result;
@@ -2695,6 +2752,21 @@ p2l_index_lookup(apr_array_header_t *ent
page_info.page_start,
page_info.page_size, iterpool));
+ /* The last cache entry must not end beyond the range covered by
+ * this index. The same applies for any subset of entries. */
+ if (page_entries->nelts)
+ {
+ const svn_fs_x__p2l_entry_t *entry
+ = &APR_ARRAY_IDX(page_entries, page_entries->nelts - 1,
+ svn_fs_x__p2l_entry_t);
+ if ( entry->offset + entry->size
+ > page_info.page_size * page_info.page_count)
+ return svn_error_createf(SVN_ERR_FS_INDEX_OVERFLOW , NULL,
+ _("Last P2L index entry extends beyond "
+ "the last page in revision %ld."),
+ revision);
+ }
+
SVN_ERR(svn_cache__set(ffd->p2l_page_cache, &key, page_entries,
iterpool));
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.c Fri Oct 31 22:03:45 2014
@@ -27,6 +27,7 @@
#include "private/svn_sorts_private.h"
#include "private/svn_string_private.h"
#include "private/svn_subr_private.h"
+#include "private/svn_fspath.h"
#include "../libsvn_fs/fs-loader.h"
@@ -71,6 +72,36 @@
* various flags. */
#define MAX_CHANGE_LINE_LEN FSX_MAX_PATH_LEN + 256
+/* Convert the C string in *TEXT to a revision number and return it in *REV.
+ * Overflows, negative values other than -1 and terminating characters other
+ * than 0x20 or 0x0 will cause an error. Set *TEXT to the first char after
+ * the initial separator or to EOS.
+ */
+static svn_error_t *
+parse_revnum(svn_revnum_t *rev,
+ const char **text)
+{
+ const char *string = *text;
+ if ((string[0] == '-') && (string[1] == '1'))
+ {
+ *rev = SVN_INVALID_REVNUM;
+ string += 2;
+ }
+ else
+ {
+ SVN_ERR(svn_revnum_parse(rev, string, &string));
+ }
+
+ if (*string == ' ')
+ ++string;
+ else if (*string != '\0')
+ return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
+ _("Invalid character in revision number"));
+
+ *text = string;
+ return SVN_NO_ERROR;
+}
+
svn_error_t *
svn_fs_x__parse_footer(apr_off_t *l2p_offset,
apr_off_t *p2l_offset,
@@ -364,7 +395,7 @@ svn_fs_x__read_noderev(node_revision_t *
SVN_ERR(svn_stream_close(stream));
- noderev->id = svn_fs_x__id_parse(value, result_pool);
+ SVN_ERR(svn_fs_x__id_parse(&noderev->id, value, result_pool));
noderev_id = value; /* for error messages later */
/* Read the type. */
@@ -415,6 +446,11 @@ svn_fs_x__read_noderev(node_revision_t *
}
else
{
+ if (!svn_fspath__is_canonical(value))
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+ _("Non-canonical cpath field in node-rev '%s'"),
+ noderev_id);
+
noderev->created_path = auto_unescape_path(apr_pstrdup(result_pool,
value),
result_pool);
@@ -423,7 +459,8 @@ svn_fs_x__read_noderev(node_revision_t *
/* Get the predecessor ID. */
value = svn_hash_gets(headers, HEADER_PRED);
if (value)
- noderev->predecessor_id = svn_fs_x__id_parse(value, result_pool);
+ SVN_ERR(svn_fs_x__id_parse(&noderev->predecessor_id, value,
+ result_pool));
/* Get the copyroot. */
value = svn_hash_gets(headers, HEADER_COPYROOT);
@@ -434,17 +471,9 @@ svn_fs_x__read_noderev(node_revision_t *
}
else
{
- char *str;
+ SVN_ERR(parse_revnum(&noderev->copyroot_rev, (const char **)&value));
- str = svn_cstring_tokenize(" ", &value);
- if (str == NULL)
- return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
- _("Malformed copyroot line in node-rev '%s'"),
- noderev_id);
-
- noderev->copyroot_rev = SVN_STR_TO_REV(str);
-
- if (*value == '\0')
+ if (!svn_fspath__is_canonical(value))
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("Malformed copyroot line in node-rev '%s'"),
noderev_id);
@@ -462,13 +491,7 @@ svn_fs_x__read_noderev(node_revision_t *
}
else
{
- char *str = svn_cstring_tokenize(" ", &value);
- if (str == NULL)
- return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
- _("Malformed copyfrom line in node-rev '%s'"),
- noderev_id);
-
- noderev->copyfrom_rev = SVN_STR_TO_REV(str);
+ SVN_ERR(parse_revnum(&noderev->copyfrom_rev, (const char **)&value));
if (*value == 0)
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
@@ -645,10 +668,7 @@ svn_fs_x__read_rep_header(svn_fs_x__rep_
if (! str || (strcmp(str, REP_DELTA) != 0))
goto error;
- str = svn_cstring_tokenize(" ", &last_str);
- if (! str)
- goto error;
- (*header)->base_revision = SVN_STR_TO_REV(str);
+ SVN_ERR(parse_revnum(&(*header)->base_revision, (const char **)&last_str));
str = svn_cstring_tokenize(" ", &last_str);
if (! str)
@@ -726,7 +746,7 @@ read_change(change_t **change_p,
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Invalid changes line in rev-file"));
- info->node_rev_id = svn_fs_x__id_parse(str, result_pool);
+ SVN_ERR(svn_fs_x__id_parse(&info->node_rev_id, str, result_pool));
if (info->node_rev_id == NULL)
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Invalid changes line in rev-file"));
@@ -842,6 +862,10 @@ read_change(change_t **change_p,
}
/* Get the changed path. */
+ if (!svn_fspath__is_canonical(last_str))
+ return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
+ _("Invalid path in changes line"));
+
change->path.data = auto_unescape_path(apr_pstrmemdup(result_pool,
last_str,
strlen(last_str)),
@@ -859,15 +883,11 @@ read_change(change_t **change_p,
else
{
last_str = line->data;
- str = svn_cstring_tokenize(" ", &last_str);
- if (! str)
- return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
- _("Invalid changes line in rev-file"));
- info->copyfrom_rev = SVN_STR_TO_REV(str);
+ SVN_ERR(parse_revnum(&info->copyfrom_rev, (const char **)&last_str));
- if (! last_str)
+ if (!svn_fspath__is_canonical(last_str))
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
- _("Invalid changes line in rev-file"));
+ _("Invalid copy-from path in changes line"));
info->copyfrom_path = auto_unescape_path(last_str, result_pool);
}
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Oct 31 22:03:45 2014
@@ -4103,10 +4103,12 @@ stringify_node(dag_node_t *node,
/* Check metadata sanity on NODE, and on its children. Manually verify
information for DAG nodes in revision REV, and trust the metadata
- accuracy for nodes belonging to older revisions. */
+ accuracy for nodes belonging to older revisions. To detect cycles,
+ provide all parent dag_node_t * in PARENT_NODES. */
static svn_error_t *
verify_node(dag_node_t *node,
svn_revnum_t rev,
+ apr_array_header_t *parent_nodes,
apr_pool_t *pool)
{
svn_boolean_t has_mergeinfo;
@@ -4116,6 +4118,18 @@ verify_node(dag_node_t *node,
int pred_count;
svn_node_kind_t kind;
apr_pool_t *iterpool = svn_pool_create(pool);
+ int i;
+
+ /* Detect (non-)DAG cycles. */
+ for (i = 0; i < parent_nodes->nelts; ++i)
+ {
+ dag_node_t *parent = APR_ARRAY_IDX(parent_nodes, i, dag_node_t *);
+ if (svn_fs_x__id_eq(svn_fs_x__dag_get_id(parent),
+ svn_fs_x__dag_get_id(node)))
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+ "Node is its own direct or indirect parent '%s'",
+ stringify_node(node, iterpool));
+ }
/* Fetch some data. */
SVN_ERR(svn_fs_x__dag_has_mergeinfo(&has_mergeinfo, node));
@@ -4167,8 +4181,8 @@ verify_node(dag_node_t *node,
if (kind == svn_node_dir)
{
apr_array_header_t *entries;
- int i;
apr_int64_t children_mergeinfo = 0;
+ APR_ARRAY_PUSH(parent_nodes, dag_node_t*) = node;
SVN_ERR(svn_fs_x__dag_dir_entries(&entries, node, pool));
@@ -4187,7 +4201,7 @@ verify_node(dag_node_t *node,
{
SVN_ERR(svn_fs_x__dag_get_node(&child, fs, dirent->id,
iterpool));
- SVN_ERR(verify_node(child, rev, iterpool));
+ SVN_ERR(verify_node(child, rev, parent_nodes, iterpool));
SVN_ERR(svn_fs_x__dag_get_mergeinfo_count(&child_mergeinfo,
child));
}
@@ -4209,6 +4223,10 @@ verify_node(dag_node_t *node,
stringify_node(node, iterpool),
mergeinfo_count, has_mergeinfo,
children_mergeinfo);
+
+ /* If we don't make it here, there was an error / corruption.
+ * In that case, nobody will need PARENT_NODES anymore. */
+ apr_array_pop(parent_nodes);
}
svn_pool_destroy(iterpool);
@@ -4221,6 +4239,7 @@ svn_fs_x__verify_root(svn_fs_root_t *roo
{
svn_fs_t *fs = root->fs;
dag_node_t *root_dir;
+ apr_array_header_t *parent_nodes;
/* Issue #4129: bogus pred-counts and minfo-cnt's on the root node-rev
(and elsewhere). This code makes more thorough checks than the
@@ -4244,7 +4263,8 @@ svn_fs_x__verify_root(svn_fs_root_t *roo
}
/* Recursively verify ROOT_DIR. */
- SVN_ERR(verify_node(root_dir, root->rev, pool));
+ parent_nodes = apr_array_make(pool, 16, sizeof(dag_node_t *));
+ SVN_ERR(verify_node(root_dir, root->rev, parent_nodes, pool));
/* Verify explicitly the predecessor of the root. */
{
Modified: subversion/trunk/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.c Fri Oct 31 22:03:45 2014
@@ -444,7 +444,7 @@ svn_fs_x__read_min_unpacked_rev(svn_revn
SVN_ERR(svn_io_read_length_line(file, buf, &len, pool));
SVN_ERR(svn_io_file_close(file, pool));
- *min_unpacked_rev = SVN_STR_TO_REV(buf);
+ SVN_ERR(svn_revnum_parse(min_unpacked_rev, buf, NULL));
return SVN_NO_ERROR;
}
@@ -483,11 +483,15 @@ svn_fs_x__read_current(svn_revnum_t *rev
svn_fs_t *fs,
apr_pool_t *pool)
{
+ const char *str;
svn_stringbuf_t *content;
SVN_ERR(svn_fs_x__read_content(&content,
svn_fs_x__path_current(fs, pool),
pool));
- SVN_ERR(svn_revnum_parse(rev, content->data, NULL));
+ SVN_ERR(svn_revnum_parse(rev, content->data, &str));
+ if (*str != '\n')
+ return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
+ _("Corrupt 'current' file"));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs_x/verify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/verify.c?rev=1635870&r1=1635869&r2=1635870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/verify.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/verify.c Fri Oct 31 22:03:45 2014
@@ -403,7 +403,7 @@ expected_checksum(apr_file_t *file,
SVN_ERR(svn_io_file_name_get(&file_name, file, pool));
SVN_ERR(svn_io_file_name_get(&file_name, file, pool));
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
- _("Checksum mismatch item at offset %s of "
+ _("Checksum mismatch in item at offset %s of "
"length %s bytes in file %s"),
apr_off_t_toa(pool, entry->offset),
apr_off_t_toa(pool, entry->size), file_name);
@@ -521,6 +521,11 @@ compare_p2l_to_rev(svn_fs_t *fs,
offset, ffd->p2l_page_size,
iterpool, iterpool));
+ /* The above might have moved the file pointer.
+ * Ensure we actually start reading at OFFSET. */
+ SVN_ERR(svn_io_file_aligned_seek(rev_file->file, ffd->block_size,
+ NULL, offset, iterpool));
+
/* process all entries (and later continue with the next block) */
for (i = 0; i < entries->nelts; ++i)
{
@@ -553,7 +558,7 @@ compare_p2l_to_rev(svn_fs_t *fs,
if (entry->offset != max_offset)
SVN_ERR(read_all_nul(rev_file->file, entry->size, pool));
}
- else if (entry->fnv1_checksum)
+ else
{
if (entry->size < STREAM_THRESHOLD)
SVN_ERR(expected_buffered_checksum(rev_file->file, entry,