From: Rong Zhang ulin0208@gmail.com
[ Upstream commit b1e9d89408f402858c00103f9831b25ffa0994d3 ]
After applying this patch, could correctly create symlink:
ln -s "relative/path/to/file" symlink
Signed-off-by: Rong Zhang ulin0208@gmail.com [almaz.alexandrovich@paragon-software.com: added cpu_to_le32 macro to rs->Flags assignment] Signed-off-by: Konstantin Komarov almaz.alexandrovich@paragon-software.com Signed-off-by: Sasha Levin sashal@kernel.org ---
LLM Generated explanations, may be completely bogus:
**Backport Status: YES**
This commit should be backported to stable kernel trees for the following reasons:
1. **Bug Fix for User-Facing Functionality**: The commit fixes a specific bug where creating relative symlinks in NTFS3 filesystems would fail. The commit message clearly states it fixes the ability to run `ln -s "relative/path/to/file" symlink`, which is a basic filesystem operation that users expect to work correctly.
2. **Small and Contained Change**: The fix is relatively small and well- contained within the NTFS3 symlink creation code. The changes are limited to: - Adding an `is_absolute` parameter to `ntfs_reparse_bytes()` function - Modifying buffer size calculations based on whether the path is absolute or relative - Setting the `SYMLINK_FLAG_RELATIVE` flag correctly in `rs->Flags` - Conditionally adding the Windows path decoration (`??`) only for absolute paths
3. **Clear Root Cause**: The original code always treated symlinks as absolute paths by: - Always setting `rs->Flags = 0` (line 1125 in original), which means absolute path - Always adding 4 extra characters for the `??` prefix in buffer calculations - Always decorating paths with `??` prefix regardless of path type
4. **Minimal Risk of Regression**: The changes are straightforward: - The fix correctly identifies absolute paths by checking if the second character is ':' (Windows drive letter format) - It properly sets `SYMLINK_FLAG_RELATIVE` (value 1) for relative paths using `cpu_to_le32()` for endianness - Buffer calculations and path decorations are adjusted accordingly
5. **No Architectural Changes**: This is purely a bug fix that corrects the handling of relative symlinks. It doesn't introduce new features or change any fundamental behavior of the filesystem.
6. **Important for Interoperability**: NTFS3 is used for compatibility with Windows filesystems. Having broken relative symlink support impacts users who need to share filesystems between Linux and Windows, making this an important functionality fix.
The commit follows stable kernel rules by being a clear bug fix with minimal changes and low risk of introducing new issues. The fact that the maintainer added the proper endianness conversion (`cpu_to_le32`) shows careful attention to correctness.
fs/ntfs3/inode.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c index 7adfa19a2f06..edd7c89ba1a1 100644 --- a/fs/ntfs3/inode.c +++ b/fs/ntfs3/inode.c @@ -1118,10 +1118,10 @@ int inode_write_data(struct inode *inode, const void *data, size_t bytes) * Number of bytes for REPARSE_DATA_BUFFER(IO_REPARSE_TAG_SYMLINK) * for unicode string of @uni_len length. */ -static inline u32 ntfs_reparse_bytes(u32 uni_len) +static inline u32 ntfs_reparse_bytes(u32 uni_len, bool is_absolute) { /* Header + unicode string + decorated unicode string. */ - return sizeof(short) * (2 * uni_len + 4) + + return sizeof(short) * (2 * uni_len + (is_absolute ? 4 : 0)) + offsetof(struct REPARSE_DATA_BUFFER, SymbolicLinkReparseBuffer.PathBuffer); } @@ -1134,8 +1134,11 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, struct REPARSE_DATA_BUFFER *rp; __le16 *rp_name; typeof(rp->SymbolicLinkReparseBuffer) *rs; + bool is_absolute;
- rp = kzalloc(ntfs_reparse_bytes(2 * size + 2), GFP_NOFS); + is_absolute = (strlen(symname) > 1 && symname[1] == ':'); + + rp = kzalloc(ntfs_reparse_bytes(2 * size + 2, is_absolute), GFP_NOFS); if (!rp) return ERR_PTR(-ENOMEM);
@@ -1150,7 +1153,7 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, goto out;
/* err = the length of unicode name of symlink. */ - *nsize = ntfs_reparse_bytes(err); + *nsize = ntfs_reparse_bytes(err, is_absolute);
if (*nsize > sbi->reparse.max_size) { err = -EFBIG; @@ -1170,7 +1173,7 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname,
/* PrintName + SubstituteName. */ rs->SubstituteNameOffset = cpu_to_le16(sizeof(short) * err); - rs->SubstituteNameLength = cpu_to_le16(sizeof(short) * err + 8); + rs->SubstituteNameLength = cpu_to_le16(sizeof(short) * err + (is_absolute ? 8 : 0)); rs->PrintNameLength = rs->SubstituteNameOffset;
/* @@ -1178,16 +1181,18 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname, * parse this path. * 0-absolute path 1- relative path (SYMLINK_FLAG_RELATIVE). */ - rs->Flags = 0; + rs->Flags = cpu_to_le32(is_absolute ? 0 : SYMLINK_FLAG_RELATIVE);
- memmove(rp_name + err + 4, rp_name, sizeof(short) * err); + memmove(rp_name + err + (is_absolute ? 4 : 0), rp_name, sizeof(short) * err);
- /* Decorate SubstituteName. */ - rp_name += err; - rp_name[0] = cpu_to_le16('\'); - rp_name[1] = cpu_to_le16('?'); - rp_name[2] = cpu_to_le16('?'); - rp_name[3] = cpu_to_le16('\'); + if (is_absolute) { + /* Decorate SubstituteName. */ + rp_name += err; + rp_name[0] = cpu_to_le16('\'); + rp_name[1] = cpu_to_le16('?'); + rp_name[2] = cpu_to_le16('?'); + rp_name[3] = cpu_to_le16('\'); + }
return rp; out: