Skip to content

Commit

Permalink
cifs: Fix parsing native symlinks directory/file type
Browse files Browse the repository at this point in the history
As SMB protocol distinguish between symlink to directory and symlink to
file, add some mechanism to disallow resolving incompatible types.

When SMB symlink is of the directory type, ensure that its target path ends
with slash. This forces Linux to not allow resolving such symlink to file.

And when SMB symlink is of the file type and its target path ends with
slash then returns an error as such symlink is unresolvable. Such symlink
always points to invalid location as file cannot end with slash.

As POSIX server does not distinguish between symlinks to file and symlink
directory, do not apply this change for symlinks from POSIX SMB server. For
POSIX SMB servers, this change does nothing.

This mimics Windows behavior of native SMB symlinks.

Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
  • Loading branch information
Pali Rohár authored and Steve French committed Jan 31, 2025
1 parent 2008d8c commit a49da4e
Showing 4 changed files with 62 additions and 0 deletions.
5 changes: 5 additions & 0 deletions fs/smb/client/inode.c
Original file line number Diff line number Diff line change
@@ -1216,6 +1216,11 @@ static int reparse_info_to_fattr(struct cifs_open_info_data *data,
full_path,
iov, data);
}

if (data->reparse.tag == IO_REPARSE_TAG_SYMLINK && !rc) {
bool directory = le32_to_cpu(data->fi.Attributes) & ATTR_DIRECTORY;
rc = smb2_fix_symlink_target_type(&data->symlink_target, directory, cifs_sb);
}
break;
}

51 changes: 51 additions & 0 deletions fs/smb/client/smb2file.c
Original file line number Diff line number Diff line change
@@ -63,6 +63,52 @@ static struct smb2_symlink_err_rsp *symlink_data(const struct kvec *iov)
return sym;
}

int smb2_fix_symlink_target_type(char **target, bool directory, struct cifs_sb_info *cifs_sb)
{
char *buf;
int len;

/*
* POSIX server does not distinguish between symlinks to file and
* symlink directory. So nothing is needed to fix on the client side.
*/
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
return 0;

if (!*target)
return -EIO;

len = strlen(*target);
if (!len)
return -EIO;

/*
* If this is directory symlink and it does not have trailing slash then
* append it. Trailing slash simulates Windows/SMB behavior which do not
* allow resolving directory symlink to file.
*/
if (directory && (*target)[len-1] != '/') {
buf = krealloc(*target, len+2, GFP_KERNEL);
if (!buf)
return -ENOMEM;
buf[len] = '/';
buf[len+1] = '\0';
*target = buf;
len++;
}

/*
* If this is a file (non-directory) symlink and it points to path name
* with trailing slash then this is an invalid symlink because file name
* cannot contain slash character. File name with slash is invalid on
* both Windows and Linux systems. So return an error for such symlink.
*/
if (!directory && (*target)[len-1] == '/')
return -EIO;

return 0;
}

int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct kvec *iov,
const char *full_path, char **path)
{
@@ -132,6 +178,11 @@ int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms, __u32
NULL, NULL, NULL);
oparms->create_options &= ~OPEN_REPARSE_POINT;
}
if (!rc) {
bool directory = le32_to_cpu(data->fi.Attributes) & ATTR_DIRECTORY;
rc = smb2_fix_symlink_target_type(&data->symlink_target,
directory, oparms->cifs_sb);
}
}
}

5 changes: 5 additions & 0 deletions fs/smb/client/smb2inode.c
Original file line number Diff line number Diff line change
@@ -1010,6 +1010,11 @@ int smb2_query_path_info(const unsigned int xid,
else
rc = -EOPNOTSUPP;
}

if (data->reparse.tag == IO_REPARSE_TAG_SYMLINK && !rc) {
bool directory = le32_to_cpu(data->fi.Attributes) & ATTR_DIRECTORY;
rc = smb2_fix_symlink_target_type(&data->symlink_target, directory, cifs_sb);
}
break;
case -EREMOTE:
break;
1 change: 1 addition & 0 deletions fs/smb/client/smb2proto.h
Original file line number Diff line number Diff line change
@@ -111,6 +111,7 @@ extern int smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon,
struct cifs_sb_info *cifs_sb,
const unsigned char *path, char *pbuf,
unsigned int *pbytes_read);
int smb2_fix_symlink_target_type(char **target, bool directory, struct cifs_sb_info *cifs_sb);
int smb2_parse_native_symlink(char **target, const char *buf, unsigned int len,
bool relative,
const char *full_path,

0 comments on commit a49da4e

Please sign in to comment.