Make sure that get_xattr_data() never tries to malloc 0 bytes.

[rsync/rsync.git] / xattrs.c

diff --git a/xattrs.c b/xattrs.c
index 50748b4..23b5faa 100644 (file)
--- a/xattrs.c
+++ b/xattrs.c
@@ -64,6 +64,8 @@ extern int checksum_seed;
 #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
 
 #define XSTAT_ATTR RSYNC_PREFIX "%stat"
+#define XACC_ACL_ATTR RSYNC_PREFIX "%aacl"
+#define XDEF_ACL_ATTR RSYNC_PREFIX "%dacl"
 
 typedef struct {
        char *datum, *name;
@@ -159,8 +161,11 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
                            int no_missing_error)
 {
        size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
+       size_t extra_len = *len_ptr;
        char *ptr;
 
+       *len_ptr = datum_len;
+
        if (datum_len == (size_t)-1) {
                if (errno == ENOTSUP || no_missing_error)
                        return NULL;
@@ -170,12 +175,12 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
                return NULL;
        }
 
-       if (datum_len + *len_ptr < datum_len /* checks for overflow */
-        || !(ptr = new_array(char, datum_len + *len_ptr)))
+       if (!datum_len && !extra_len)
+               extra_len = 1; /* request non-zero amount of memory */
+       if (datum_len + extra_len < datum_len /* checks for overflow */
+        || !(ptr = new_array(char, datum_len + extra_len)))
                out_of_memory("get_xattr_data");
 
-       *len_ptr = datum_len;
-
        if (datum_len) {
                size_t len = sys_lgetxattr(fname, name, ptr, datum_len);
                if (len != datum_len) {
@@ -798,6 +803,32 @@ int set_xattr(const char *fname, const struct file_struct *file,
        return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
 }
 
+#ifdef SUPPORT_ACLS
+char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
+{
+       const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
+       *len_p = 0; /* no extra data alloc needed from get_xattr_data() */
+       return get_xattr_data(fname, name, len_p, 1);
+}
+
+int set_xattr_acl(const char *fname, int is_access_acl, const char *buf, size_t buf_len)
+{
+       const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
+       if (sys_lsetxattr(fname, name, buf, buf_len) < 0) {
+               rsyserr(FERROR, errno,
+                       "set_xattr_acl: lsetxattr(\"%s\",\"%s\") failed",
+                       fname, name);
+               return -1;
+       }
+       return 0;
+}
+
+int del_def_xattr_acl(const char *fname)
+{
+       return sys_lremovexattr(fname, XDEF_ACL_ATTR);
+}
+#endif
+
 int get_stat_xattr(const char *fname, int fd, STRUCT_STAT *fst, STRUCT_STAT *xst)
 {
        int mode, rdev_major, rdev_minor, uid, gid, len;