[Bug 12036] New: Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[Bug 12036] New: Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior

samba-bugs
https://bugzilla.samba.org/show_bug.cgi?id=12036

            Bug ID: 12036
           Summary: Multiple --link-dest, --copy-dest, or --compare-dest
                    flags produce incorrect behavior
           Product: rsync
           Version: 3.1.2
          Hardware: All
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P5
         Component: core
          Assignee: [hidden email]
          Reporter: [hidden email]
        QA Contact: [hidden email]

Created attachment 12288
  --> https://bugzilla.samba.org/attachment.cgi?id=12288&action=edit
reproduction

We have observed what seems like incorrect behavior when using a command like
this:

    rsync -avc --link-dest=../copy_dest/good --link-dest=../copy_dest/bad src/
dest

with a directory stucture that looks like this:

    .
    ├── copy_dest
    │   ├── bad
    │   │   └── file       # contains different content from src, but same
attributes (e.g. mtime)
    │   └── good
    │       └── file       # contains same content as src, but different
attributes (e.g. mtime)
    └── src
        └── file

Using the command above, we see that "bad/file" is hard-linked into "dest",
even though it is different from "file" in src.

I've attached repro.sh which reliably reproduces this for me on the latest
version of rsync.

--
You are receiving this mail because:
You are the QA Contact for the bug.

--
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
Reply | Threaded
Open this post in threaded view
|

[Bug 12036] Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior

samba-bugs
https://bugzilla.samba.org/show_bug.cgi?id=12036

--- Comment #1 from Chris Kuehl <[hidden email]> ---
Looking through the code, this sticks out to me:

    static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
                 char *cmpbuf, stat_x *sxp, int find_exact_for_existing,
                 int itemizing, enum logcode code)
    {
        STRUCT_STAT real_st = sxp->st;
        int best_match = -1;
        int match_level = 0;
        int j = 0;

        do {
            pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
            if (link_stat(cmpbuf, &sxp->st, 0) < 0 ||
!S_ISREG(sxp->st.st_mode))
                continue;
            switch (match_level) {
            case 0:
                best_match = j;
                match_level = 1;
                /* FALL THROUGH */
            case 1:
                if (!unchanged_file(cmpbuf, file, &sxp->st))
                    continue;
                best_match = j;
                match_level = 2;
                /* FALL THROUGH */
            case 2:
                if (!unchanged_attrs(cmpbuf, file, sxp)) {
                    free_stat_x(sxp);
                    continue;
                }
                best_match = j;
                match_level = 3;
                break;
            }
            break;
        } while (basis_dir[++j] != NULL);

It looks to me like on the first iteration of the loop, we match all the way
through to "match_level = 2" with the file from "copy_dest/good", which has the
same content. The mtime doesn't match, though, so we break there.

On the second iteration of the loop, "match_level" is still 2, and we only
compare the attributes with the file from "copy_dest/bad" (never the content).
We then break from the loop and link the wrong file into dest.

I've attached my attempt at a patch to correct this.

--
You are receiving this mail because:
You are the QA Contact for the bug.

--
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
Reply | Threaded
Open this post in threaded view
|

[Bug 12036] Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior

samba-bugs
In reply to this post by samba-bugs
https://bugzilla.samba.org/show_bug.cgi?id=12036

--- Comment #2 from Chris Kuehl <[hidden email]> ---
Created attachment 12289
  --> https://bugzilla.samba.org/attachment.cgi?id=12289&action=edit
proposed patch

--
You are receiving this mail because:
You are the QA Contact for the bug.

--
Please use reply-all for most replies to avoid omitting the mailing list.
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html