| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1405010678-993-1-git-send-email-ross.burton@intel.com>
Date: Thu, 10 Jul 2014 17:44:38 +0100
From: Ross Burton <ross.burton@...el.com>
To: linux-ext4@...r.kernel.org
Cc: darrick.wong@...cle.com, tytso@....edu
Subject: [PATCH][V4] misc: copy extended attributes in populate_fs
When creating a file system using a source directory, also copy any extended
attributes that have been set.
Signed-off-by: Ross Burton <ross.burton@...el.com>
Reviewed-by: Darrick J. Wong <darrick.wong@...cle.com>
---
misc/create_inode.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/misc/create_inode.c b/misc/create_inode.c
index c9c99b5..660a294 100644
--- a/misc/create_inode.c
+++ b/misc/create_inode.c
@@ -103,6 +103,89 @@ static errcode_t set_inode_extra(ext2_filsys fs, ext2_ino_t cwd,
return retval;
}
+static errcode_t set_inode_xattr(ext2_filsys fs, ext2_ino_t ino, const char *filename)
+{
+ errcode_t retval, close_retval;
+ struct ext2_inode inode;
+ struct ext2_xattr_handle *handle;
+ ssize_t size, value_size;
+ char *list;
+ int i;
+
+ size = llistxattr(filename, NULL, 0);
+ if (size == -1) {
+ com_err(__func__, errno, "llistxattr failed on %s", filename);
+ return errno;
+ } else if (size == 0) {
+ return 0;
+ }
+
+ retval = ext2fs_xattrs_open(fs, ino, &handle);
+ if (retval) {
+ if (retval == EXT2_ET_MISSING_EA_FEATURE)
+ return 0;
+ com_err(__func__, retval, "while opening inode %u", ino);
+ return retval;
+ }
+
+ retval = ext2fs_get_mem(size, &list);
+ if (retval) {
+ com_err(__func__, retval, "whilst allocating memory");
+ goto out;
+ }
+
+ size = llistxattr(filename, list, size);
+ if (size == -1) {
+ com_err(__func__, errno, "llistxattr failed on %s", filename);
+ retval = errno;
+ goto out;
+ }
+
+ for (i = 0; i < size; i += strlen(&list[i]) + 1) {
+ const char *name = &list[i];
+ char *value;
+
+ value_size = getxattr(filename, name, NULL, 0);
+ if (value_size == -1) {
+ com_err(__func__, errno, "getxattr failed on %s", filename);
+ retval = errno;
+ break;
+ }
+
+ retval = ext2fs_get_mem(value_size, &value);
+ if (retval) {
+ com_err(__func__, retval, "whilst allocating memory");
+ break;
+ }
+
+ value_size = getxattr(filename, name, value, value_size);
+ if (value_size == -1) {
+ ext2fs_free_mem(&value);
+ com_err(__func__, errno, "getxattr failed on %s", filename);
+ retval = errno;
+ break;
+ }
+
+ retval = ext2fs_xattr_set(handle, name, value, value_size);
+ ext2fs_free_mem(&value);
+ if (retval) {
+ com_err(__func__, retval, "while writing xattr %u", ino);
+ break;
+ }
+
+ }
+ out:
+ ext2fs_free_mem(&list);
+
+ close_retval = ext2fs_xattrs_close(&handle);
+ if (close_retval) {
+ com_err(__func__, retval, "while closing inode %u", ino);
+ retval = retval ? retval : close_retval;
+ }
+
+ return retval;
+}
+
/* Make a special files (block and character devices), fifo's, and sockets */
errcode_t do_mknod_internal(ext2_filsys fs, ext2_ino_t cwd, const char *name,
struct stat *st)
@@ -615,6 +698,13 @@ static errcode_t __populate_fs(ext2_filsys fs, ext2_ino_t parent_ino,
goto out;
}
+ retval = set_inode_xattr(fs, ino, name);
+ if (retval) {
+ com_err(__func__, retval,
+ _("while setting xattrs for \"%s\""), name);
+ goto out;
+ }
+
/* Save the hardlink ino */
if (save_inode) {
/*
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists