Fix a bogus free in uncache_tmp_xattrs().

[rsync/rsync.git] / xattrs.c

diff --git a/xattrs.c b/xattrs.c
index ee21c8d..7931325 100644 (file)
--- a/xattrs.c
+++ b/xattrs.c
@@ -3,7 +3,7 @@
  * Written by Jay Fenlason, vaguely based on the ACLs patch.
  *
  * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2006-2008 Wayne Davison
+ * Copyright (C) 2006-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include "rsync.h"
 #include "ifuncs.h"
+#include "inums.h"
 #include "lib/sysxattrs.h"
 
 #ifdef SUPPORT_XATTRS
@@ -81,6 +82,8 @@ static char *namebuf = NULL;
 static item_list empty_xattr = EMPTY_ITEM_LIST;
 static item_list rsync_xal_l = EMPTY_ITEM_LIST;
 
+static size_t prior_xattr_count = (size_t)-1;
+
 /* ------------------------------------------------------------------------- */
 
 static void rsync_xal_free(item_list *xalp)
@@ -114,7 +117,7 @@ static int rsync_xal_compare_names(const void *x1, const void *x2)
 static ssize_t get_xattr_names(const char *fname)
 {
        ssize_t list_len;
-       double arg;
+       int64 arg;
 
        if (!namebuf) {
                namebuf_len = 1024;
@@ -132,11 +135,11 @@ static ssize_t get_xattr_names(const char *fname)
                } else if (errno == ENOTSUP)
                        return 0;
                else if (errno != ERANGE) {
-                       arg = (double)namebuf_len;
+                       arg = namebuf_len;
                  got_error:
                        rsyserr(FERROR_XFER, errno,
-                               "get_xattr_names: llistxattr(\"%s\",%.0f) failed",
-                               fname, arg);
+                               "get_xattr_names: llistxattr(\"%s\",%s) failed",
+                               fname, big_num(arg));
                        return -1;
                }
                list_len = sys_llistxattr(fname, NULL, 0);
@@ -281,6 +284,20 @@ int get_xattr(const char *fname, stat_x *sxp)
 {
        sxp->xattr = new(item_list);
        *sxp->xattr = empty_xattr;
+
+#ifdef NO_SPECIAL_XATTRS
+       if (IS_SPECIAL(sxp->st.st_mode))
+               return 0;
+#endif
+#ifdef NO_DEVICE_XATTRS
+       if (IS_DEVICE(sxp->st.st_mode))
+               return 0;
+#endif
+#ifdef NO_SYMLINK_XATTRS
+       if (S_ISLNK(sxp->st.st_mode))
+               return 0;
+#endif
+
        if (rsync_xal_get(fname, sxp->xattr) < 0) {
                free_xattr(sxp);
                return -1;
@@ -294,7 +311,7 @@ int copy_xattrs(const char *source, const char *dest)
        size_t datum_len;
        char *name, *ptr;
 #ifdef HAVE_LINUX_XATTRS
-       int user_only = am_sender ? 0 : !am_root;
+       int user_only = am_sender ? 0 : am_root <= 0;
 #endif
 
        /* This puts the name list into the "namebuf" buffer. */
@@ -724,13 +741,15 @@ void receive_xattr(struct file_struct *file, int f)
 
 /* Turn the xattr data in stat_x into cached xattr data, setting the index
  * values in the file struct. */
-void cache_xattr(struct file_struct *file, stat_x *sxp)
+void cache_tmp_xattr(struct file_struct *file, stat_x *sxp)
 {
        int ndx;
 
        if (!sxp->xattr)
                return;
 
+       if (prior_xattr_count == (size_t)-1)
+               prior_xattr_count = rsync_xal_l.count;
        ndx = find_matching_xattr(sxp->xattr);
        if (ndx < 0)
                rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
@@ -738,6 +757,21 @@ void cache_xattr(struct file_struct *file, stat_x *sxp)
        F_XATTR(file) = ndx;
 }
 
+void uncache_tmp_xattrs(void)
+{
+       if (prior_xattr_count != (size_t)-1) {
+               item_list *xattr_item = rsync_xal_l.items;
+               item_list *xattr_start = xattr_item + prior_xattr_count;
+               xattr_item += rsync_xal_l.count;
+               rsync_xal_l.count = prior_xattr_count;
+               while (xattr_item-- > xattr_start) {
+                       rsync_xal_free(xattr_item);
+                       free(xattr_item->items);
+               }
+               prior_xattr_count = (size_t)-1;
+       }
+}
+
 static int rsync_xal_set(const char *fname, item_list *xalp,
                         const char *fnamecmp, stat_x *sxp)
 {
@@ -745,6 +779,9 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
        ssize_t list_len;
        size_t i, len;
        char *name, *ptr, sum[MAX_DIGEST_LEN];
+#ifdef HAVE_LINUX_XATTRS
+       int user_only = am_root <= 0;
+#endif
        size_t name_len;
        int ret = 0;
 
@@ -820,8 +857,8 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
 #ifdef HAVE_LINUX_XATTRS
                /* We always ignore the system namespace, and non-root
                 * ignores everything but the user namespace. */
-               if (am_root ? HAS_PREFIX(name, SYSTEM_PREFIX)
-                           : !HAS_PREFIX(name, USER_PREFIX))
+               if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
+                             : HAS_PREFIX(name, SYSTEM_PREFIX))
                        continue;
 #endif
                if (am_root < 0 && name_len > RPRE_LEN
@@ -861,6 +898,25 @@ int set_xattr(const char *fname, const struct file_struct *file,
                return -1;
        }
 
+#ifdef NO_SPECIAL_XATTRS
+       if (IS_SPECIAL(sxp->st.st_mode)) {
+               errno = ENOTSUP;
+               return -1;
+       }
+#endif
+#ifdef NO_DEVICE_XATTRS
+       if (IS_DEVICE(sxp->st.st_mode)) {
+               errno = ENOTSUP;
+               return -1;
+       }
+#endif
+#ifdef NO_SYMLINK_XATTRS
+       if (S_ISLNK(sxp->st.st_mode)) {
+               errno = ENOTSUP;
+               return -1;
+       }
+#endif
+
        ndx = F_XATTR(file);
        return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
 }
@@ -967,7 +1023,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
        fst.st_mode &= (_S_IFMT | CHMOD_BITS);
        fmode = new_mode & (_S_IFMT | CHMOD_BITS);
 
-       if (IS_DEVICE(fmode) || IS_SPECIAL(fmode)) {
+       if (IS_DEVICE(fmode)) {
                uint32 *devp = F_RDEV_P(file);
                rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
        } else
@@ -978,7 +1034,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
             | (S_ISDIR(fst.st_mode) ? 0700 : 0600);
        if (fst.st_mode != mode)
                do_chmod(fname, mode);
-       if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode))
+       if (!IS_DEVICE(fst.st_mode))
                fst.st_rdev = 0; /* just in case */
 
        if (mode == fmode && fst.st_rdev == rdev