upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 01:41:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

set_flags: use get/set to only influence specific flags, fixes #9039

Browse source 
Linux platform only.
This commit is contained in:
Thomas Waldmann 2025-10-16 21:26:49 +02:00
parent 4cbc893f31
commit 9214197a2c
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/borg/platform/linux.pyx
View file

@ -128,6 +128,8 @@ BSD_TO_LINUX_FLAGS = {
stat.UF_APPEND: FS_APPEND_FL,
stat.UF_COMPRESSED: FS_COMPR_FL,
}
# must be a bitwise OR of all values in BSD_TO_LINUX_FLAGS.
LINUX_MASK = FS_NODUMP_FL | FS_IMMUTABLE_FL | FS_APPEND_FL | FS_COMPR_FL
def set_flags(path, bsd_flags, fd=None):
@ -136,17 +138,31 @@ def set_flags(path, bsd_flags, fd=None):
if stat.S_ISBLK(st.st_mode) or stat.S_ISCHR(st.st_mode) or stat.S_ISLNK(st.st_mode):
# See comment in get_flags().
return
cdef int flags = 0
cdef int flags
cdef int mask = LINUX_MASK # 1 at positions we want to influence
cdef int new_flags = 0
for bsd_flag, linux_flag in BSD_TO_LINUX_FLAGS.items():
if bsd_flags & bsd_flag:
flags |= linux_flag
new_flags |= linux_flag
open_fd = fd is None
if open_fd:
fd = os.open(path, os.O_RDONLY|os.O_NONBLOCK|os.O_NOFOLLOW)
try:
# Get current flags. If this fails, fall back to 0 so we can still attempt to set.
if ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1:
flags = 0
# Replace only the bits we actually want to influence, keep others.
# We can't just set all flags to the archived value, because we might
# reset flags that are not controllable from userspace, see #9039.
flags = (flags & ~mask) | (new_flags & mask)
if ioctl(fd, FS_IOC_SETFLAGS, &flags) == -1:
error_number = errno.errno
if error_number != errno.EOPNOTSUPP:
# Usually we would only catch EOPNOTSUPP here, but Linux Kernel 6.17
# has a bug where it returns ENOTTY instead of EOPNOTSUPP.
if error_number not in (errno.EOPNOTSUPP, errno.ENOTTY):
raise OSError(error_number, strerror(error_number).decode(), path)
finally:
if open_fd: