packages/dracut
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add backport-fix-dracut-install-copy-xattr-when-use-clone-ioctl.patch

Browse Source 
(cherry picked from commit 91df3ef7bc7ac20b8e825a15182468d7b3c33de8)
This commit is contained in:
zhengxiaoxiao 2024-07-11 11:17:29 +08:00 committed by openeuler-sync-bot
parent e333ba98b3
commit 21c8e213dd
2 changed files with 105 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
backport-fix-dracut-install-copy-xattr-when-use-clone-ioctl.patch Normal file
View File

@ -0,0 +1,100 @@
From 1cf0db26e43fe4c6173acdb8047f16666ebf070a Mon Sep 17 00:00:00 2001
From: Huaxin Lu <luhuaxin1@huawei.com>
Date: Thu, 20 Jun 2024 13:38:26 +0800
Subject: [PATCH] fix(dracut-install): copy xattr when use clone ioctl
When use clone ioctl to copy a file, the extended attributes of files are
missing, which is inconsistent with the result by using the cp command.
This commit add the process to copy extended attributes after clone_file().
Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
Reference:https://github.com/dracut-ng/dracut-ng/pull/461/commits/1cf0db26e43fe4c6173acdb8047f16666ebf070a
Conflict:NA
---
src/install/dracut-install.c | 56 ++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/src/install/dracut-install.c b/src/install/dracut-install.c
index 1862c599d..dd70382cb 100644
--- a/src/install/dracut-install.c
+++ b/src/install/dracut-install.c
@@ -42,6 +42,7 @@
#include <fts.h>
#include <regex.h>
#include <sys/utsname.h>
+#include <sys/xattr.h>
#include "log.h"
#include "hashmap.h"
@@ -292,6 +293,56 @@ static inline int clone_file(int dest_fd, int src_fd)
return ioctl(dest_fd, BTRFS_IOC_CLONE, src_fd);
}
+static int copy_xattr(int dest_fd, int src_fd)
+{
+ int ret = 0;
+ ssize_t name_len = 0, value_len = 0;
+ char *name_buf = NULL, *name = NULL, *value = NULL, *value_save = NULL;
+
+ name_len = flistxattr(src_fd, NULL, 0);
+ if (name_len < 0)
+ return -1;
+
+ name_buf = calloc(1, name_len + 1);
+ if (name_buf == NULL)
+ return -1;
+
+ name_len = flistxattr(src_fd, name_buf, name_len);
+ if (name_len < 0)
+ goto out;
+
+ for (name = name_buf; name != name_buf + name_len; name = strchr(name, '\0') + 1) {
+ value_len = fgetxattr(src_fd, name, NULL, 0);
+ if (value_len < 0) {
+ ret = -1;
+ continue;
+ }
+
+ value_save = value;
+ value = realloc(value, value_len);
+ if (value == NULL) {
+ value = value_save;
+ ret = -1;
+ goto out;
+ }
+
+ value_len = fgetxattr(src_fd, name, value, value_len);
+ if (value_len < 0) {
+ ret = -1;
+ continue;
+ }
+
+ value_len = fsetxattr(dest_fd, name, value, value_len, 0);
+ if (value_len < 0)
+ ret = -1;
+ }
+
+out:
+ free(name_buf);
+ free(value);
+ return ret;
+}
+
static bool use_clone = true;
static int cp(const char *src, const char *dst)
@@ -333,6 +384,11 @@ static int cp(const char *src, const char *dst)
log_info("Failed to chown %s: %m", dst);
}
+ if (geteuid() == 0 && no_xattr == false) {
+ if (copy_xattr(dest_desc, source_desc) != 0)
+ log_error("Failed to copy xattr %s: %m", dst);
+ }
+
tv[0].tv_sec = sb.st_atime;
tv[0].tv_usec = 0;
tv[1].tv_sec = sb.st_mtime;
--
2.27.0

6
dracut.spec
View File

@ -9,7 +9,7 @@
Name: dracut
Version: 055
Release: 13
Release: 14
Summary: Initramfs generator using udev
@ -99,6 +99,7 @@ Patch6048: backport-fix-dracut-logger.sh-this-fixes-the-dlog_init-check-for-dev-
Patch6049: backport-fix-dracut-replace-invalid-lzo-command-with-lzop-for-LZO-compression.patch
Patch6050: backport-fix-squash-apply-FIPS-and-libpthread-workaround.patch
Patch6051: backport-fix-zfcp_rules-correct-shellcheck-regression-when-pa.patch
Patch6052: backport-fix-dracut-install-copy-xattr-when-use-clone-ioctl.patch
Patch9000: remove-iscsi-related-code-since-it-is-no-longer-main.patch
@ -575,6 +576,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne
%endif
%changelog
* Thu Jul 11 2024 zhengxiaoxiao <zhengxiaoxiao2@huawei.com> - 055-14
- add backport-fix-dracut-install-copy-xattr-when-use-clone-ioctl.patch
* Thu Jun 13 2024 hongjinghao <hongjinghao@huawei.com> - 055-13
- backport patchs from upstream