From nobody Thu Nov 28 01:31:10 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7F7015AF6; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137029; cv=none; b=EjRfbCWeloR9oQVz2AEXo4CWRN/rYAOsXDPy027mY31t9KyWNjjarLunNm1fkH3fGwUEcaR2nPzuRGYdBT6f+Kg7SAYT/VZSt2yFjMl42sPAvd3oQx1YhRx01w/jCJAlD1ChrhghKnXCmPIjHBPwYzguRnPkUN2TnThs0obE+0A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137029; c=relaxed/simple; bh=WT1S5UxYOI1A0Z9HVnVrjqZnEWhBI0mrjPysOzPZpUQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=JY5EbnqLUQcnGAFOV0o2q01E4bZ7S28nOJGqitlvqQaS9/ZYR7GezkYDLzphlNvcB0DpR5pn0kEH2ao+PN+U7pThNwMQ1oXBmRkSVkFwF0uuDS2jXOVpvAm4vRZVZ3o2hDcYyC4vb+V3Swz3Woub+MTjBPBRd17IdzXu0YUcKuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m2b4wmNN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="m2b4wmNN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17C43C4CEC7; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728137029; bh=WT1S5UxYOI1A0Z9HVnVrjqZnEWhBI0mrjPysOzPZpUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m2b4wmNNc+olbJZnHbnqcIuHg1vb75U8kEdRbQ3Gd1dhY3CfmrU6fDQAQ9Hh7S4xu 3QCGJqMdkrVmNLU/mdSJ/x6IRwaXJ7seHEZ7qYFes9yH8TTV4qvDpG+lfZMG5vUi20 zltgLhOF+Tsc/G4OQntth2ANoYlKcdwirXA/Xj6Btvee/Q0ahF1FbHLqyyaZYwTgyB Zj3fCyXXipYF5q7KaOfVoiZKLdUUgIyI+MQ4AJpDFg8gXb1xUJH1HAFaiILwc7jxeY iDCPDmiBU70AmtIU1wo0Mhr4sZMFkyUgrKLLBR4iUEQ7dEZ4wu8b/g+39C0J08bpns d38PMtVT2VIfw== Received: by pali.im (Postfix) id 9E89B9DA; Sat, 5 Oct 2024 16:03:42 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/6] cifs: Improve creating native symlinks pointing to directory Date: Sat, 5 Oct 2024 16:02:55 +0200 Message-Id: <20241005140300.19416-2-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241005140300.19416-1-pali@kernel.org> References: <20240929185053.10554-1-pali@kernel.org> <20241005140300.19416-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable SMB protocol for native symlinks distinguish between symlink to directory and symlink to file. These two symlink types cannot be exchanged, which means that symlink of file type pointing to directory cannot be resolved at all (and vice-versa). Windows follows this rule for local filesystems (NTFS) and also for SMB. Linux SMB client currenly creates all native symlinks of file type. Which means that Windows (and some other SMB clients) cannot resolve symlinks pointing to directory created by Linux SMB client. As Linux system does not distinguish between directory and file symlinks, its API does not provide enough information for Linux SMB client during creating of native symlinks. Add some heuristic into the Linux SMB client for choosing the correct symlink type during symlink creation. Check if the symlink target location ends with slash, or last path component is dot or dot-dot, and check if the target location on SMB share exists and is a directory. If at least one condition is truth then create a new SMB symlink of directory type. Otherwise create it as file type symlink. This change improves interoperability with Windows systems. Windows systems would be able to resolve more SMB symlinks created by Linux SMB client which points to existing directory. Signed-off-by: Pali Roh=C3=A1r --- fs/smb/client/reparse.c | 164 +++++++++++++++++++++++++++++++++++++- fs/smb/client/smb2inode.c | 3 +- fs/smb/client/smb2proto.h | 1 + 3 files changed, 164 insertions(+), 4 deletions(-) diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index 35e8f2e18530..8403e1b94059 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -14,6 +14,12 @@ #include "fs_context.h" #include "reparse.h" =20 +static int detect_directory_symlink_target(struct cifs_sb_info *cifs_sb, + const unsigned int xid, + const char *full_path, + const char *symname, + bool *directory); + int smb2_create_reparse_symlink(const unsigned int xid, struct inode *inod= e, struct dentry *dentry, struct cifs_tcon *tcon, const char *full_path, const char *symname) @@ -24,6 +30,7 @@ int smb2_create_reparse_symlink(const unsigned int xid, s= truct inode *inode, struct inode *new; struct kvec iov; __le16 *path; + bool directory; char *sym, sep =3D CIFS_DIR_SEP(cifs_sb); u16 len, plen; int rc =3D 0; @@ -45,6 +52,18 @@ int smb2_create_reparse_symlink(const unsigned int xid, = struct inode *inode, goto out; } =20 + /* + * SMB distinguish between symlink to directory and symlink to file. + * They cannot be exchanged (symlink of file type which points to + * directory cannot be resolved and vice-versa). Try to detect if + * the symlink target could be a directory or not. When detection + * fails then treat symlink as a file (non-directory) symlink. + */ + directory =3D false; + rc =3D detect_directory_symlink_target(cifs_sb, xid, full_path, symname, = &directory); + if (rc < 0) + goto out; + plen =3D 2 * UniStrnlen((wchar_t *)path, PATH_MAX); len =3D sizeof(*buf) + plen * 2; buf =3D kzalloc(len, GFP_KERNEL); @@ -69,7 +88,8 @@ int smb2_create_reparse_symlink(const unsigned int xid, s= truct inode *inode, iov.iov_base =3D buf; iov.iov_len =3D len; new =3D smb2_get_reparse_inode(&data, inode->i_sb, xid, - tcon, full_path, &iov, NULL); + tcon, full_path, directory, + &iov, NULL); if (!IS_ERR(new)) d_instantiate(dentry, new); else @@ -81,6 +101,144 @@ int smb2_create_reparse_symlink(const unsigned int xid= , struct inode *inode, return rc; } =20 +static int detect_directory_symlink_target(struct cifs_sb_info *cifs_sb, + const unsigned int xid, + const char *full_path, + const char *symname, + bool *directory) +{ + char sep =3D CIFS_DIR_SEP(cifs_sb); + struct cifs_open_parms oparms; + struct tcon_link *tlink; + struct cifs_tcon *tcon; + const char *basename; + struct cifs_fid fid; + char *resolved_path; + int full_path_len; + int basename_len; + int symname_len; + char *path_sep; + __u32 oplock; + int open_rc; + + /* + * First do some simple check. If the original Linux symlink target ends + * with slash, or last path component is dot or dot-dot then it is for + * sure symlink to the directory. + */ + basename =3D kbasename(symname); + basename_len =3D strlen(basename); + if (basename_len =3D=3D 0 || /* symname ends with slash */ + (basename_len =3D=3D 1 && basename[0] =3D=3D '.') || /* last componen= t is "." */ + (basename_len =3D=3D 2 && basename[0] =3D=3D '.' && basename[1] =3D= =3D '.')) { /* or ".." */ + *directory =3D true; + return 0; + } + + /* + * For absolute symlinks it is not possible to determinate + * if it should point to directory or file. + */ + if (symname[0] =3D=3D '/') { + cifs_dbg(FYI, + "%s: cannot determinate if the symlink target path '%s' " + "is directory or not, creating '%s' as file symlink\n", + __func__, symname, full_path); + return 0; + } + + /* + * If it was not detected as directory yet and the symlink is relative + * then try to resolve the path on the SMB server, check if the path + * exists and determinate if it is a directory or not. + */ + + full_path_len =3D strlen(full_path); + symname_len =3D strlen(symname); + + tlink =3D cifs_sb_tlink(cifs_sb); + if (IS_ERR(tlink)) + return PTR_ERR(tlink); + + resolved_path =3D kzalloc(full_path_len + symname_len + 1, GFP_KERNEL); + if (!resolved_path) { + cifs_put_tlink(tlink); + return -ENOMEM; + } + + /* + * Compose the resolved SMB symlink path from the SMB full path + * and Linux target symlink path. + */ + memcpy(resolved_path, full_path, full_path_len+1); + path_sep =3D strrchr(resolved_path, sep); + if (path_sep) + path_sep++; + else + path_sep =3D resolved_path; + memcpy(path_sep, symname, symname_len+1); + if (sep =3D=3D '\\') + convert_delimiter(path_sep, sep); + + tcon =3D tlink_tcon(tlink); + oparms =3D CIFS_OPARMS(cifs_sb, tcon, resolved_path, + FILE_READ_ATTRIBUTES, FILE_OPEN, 0, ACL_NO_MODE); + oparms.fid =3D &fid; + + /* Try to open as a directory (NOT_FILE) */ + oplock =3D 0; + oparms.create_options =3D cifs_create_options(cifs_sb, + CREATE_NOT_FILE | OPEN_REPARSE_POINT); + open_rc =3D tcon->ses->server->ops->open(xid, &oparms, &oplock, NULL); + if (open_rc =3D=3D 0) { + /* Successful open means that the target path is definitely a directory.= */ + *directory =3D true; + tcon->ses->server->ops->close(xid, tcon, &fid); + } else if (open_rc =3D=3D -ENOTDIR) { + /* -ENOTDIR means that the target path is definitely a file. */ + *directory =3D false; + } else if (open_rc =3D=3D -ENOENT) { + /* -ENOENT means that the target path does not exist. */ + cifs_dbg(FYI, + "%s: symlink target path '%s' does not exist, " + "creating '%s' as file symlink\n", + __func__, symname, full_path); + } else { + /* Try to open as a file (NOT_DIR) */ + oplock =3D 0; + oparms.create_options =3D cifs_create_options(cifs_sb, + CREATE_NOT_DIR | OPEN_REPARSE_POINT); + open_rc =3D tcon->ses->server->ops->open(xid, &oparms, &oplock, NULL); + if (open_rc =3D=3D 0) { + /* Successful open means that the target path is definitely a file. */ + *directory =3D false; + tcon->ses->server->ops->close(xid, tcon, &fid); + } else if (open_rc =3D=3D -EISDIR) { + /* -EISDIR means that the target path is definitely a directory. */ + *directory =3D true; + } else { + /* + * This code branch is called when we do not have a permission to + * open the resolved_path or some other client/process denied + * opening the resolved_path. + * + * TODO: Try to use ops->query_dir_first on the parent directory + * of resolved_path, search for basename of resolved_path and + * check if the ATTR_DIRECTORY is set in fi.Attributes. In some + * case this could work also when opening of the path is denied. + */ + cifs_dbg(FYI, + "%s: cannot determinate if the symlink target path '%s' " + "is directory or not, creating '%s' as file symlink\n", + __func__, symname, full_path); + } + } + + kfree(resolved_path); + cifs_put_tlink(tlink); + return 0; +} + static int nfs_set_reparse_buf(struct reparse_posix_data *buf, mode_t mode, dev_t dev, struct kvec *iov) @@ -137,7 +295,7 @@ static int mknod_nfs(unsigned int xid, struct inode *in= ode, }; =20 new =3D smb2_get_reparse_inode(&data, inode->i_sb, xid, - tcon, full_path, &iov, NULL); + tcon, full_path, false, &iov, NULL); if (!IS_ERR(new)) d_instantiate(dentry, new); else @@ -283,7 +441,7 @@ static int mknod_wsl(unsigned int xid, struct inode *in= ode, data.wsl.eas_len =3D len; =20 new =3D smb2_get_reparse_inode(&data, inode->i_sb, - xid, tcon, full_path, + xid, tcon, full_path, false, &reparse_iov, &xattr_iov); if (!IS_ERR(new)) d_instantiate(dentry, new); diff --git a/fs/smb/client/smb2inode.c b/fs/smb/client/smb2inode.c index a6dab60e2c01..cdb0e028e73c 100644 --- a/fs/smb/client/smb2inode.c +++ b/fs/smb/client/smb2inode.c @@ -1198,6 +1198,7 @@ struct inode *smb2_get_reparse_inode(struct cifs_open= _info_data *data, const unsigned int xid, struct cifs_tcon *tcon, const char *full_path, + bool directory, struct kvec *reparse_iov, struct kvec *xattr_iov) { @@ -1217,7 +1218,7 @@ struct inode *smb2_get_reparse_inode(struct cifs_open= _info_data *data, FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, FILE_CREATE, - CREATE_NOT_DIR | OPEN_REPARSE_POINT, + (directory ? CREATE_NOT_FILE : CREATE_NOT_DIR) | OPEN_REPARSE_POIN= T, ACL_NO_MODE); if (xattr_iov) oparms.ea_cctx =3D xattr_iov; diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h index b208232b12a2..5e0855fefcfe 100644 --- a/fs/smb/client/smb2proto.h +++ b/fs/smb/client/smb2proto.h @@ -61,6 +61,7 @@ struct inode *smb2_get_reparse_inode(struct cifs_open_inf= o_data *data, const unsigned int xid, struct cifs_tcon *tcon, const char *full_path, + bool directory, struct kvec *reparse_iov, struct kvec *xattr_iov); int smb2_query_reparse_point(const unsigned int xid, --=20 2.20.1 From nobody Thu Nov 28 01:31:10 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7FE21804E; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137029; cv=none; b=Q4bVVJTX0XHy6c0z0FOlXDbl+WmF4xXpZkrFlC6LUl800s09Jz0bUiBLNzGbX/A45pL9Ds0Zo3qFkkWBfV2XlDiBF7uidKLdCiaBVTv1OisEpauR6yTywFmU9J+iLL/hcPB3oUV043G98JyrwpAUxkLsgzxAfI7EQRUHveJRdyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137029; c=relaxed/simple; bh=hDQvcu8Vv8Wg91smOeEWxvTb4XmEDvotaoUWgxTSX/w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=Djbs8Qms/MEkfWkpcZfgSW519hPI4t3Yi4wRhbO3Hlg2wbu1dADlFsKC1Jo82CrY6WSsEPpMZCXNHvAKz3oLlBNfnphSPmRkDUftiFl++qs2KTr+Tc4Gptdw0ovBoeM61KCWFzVyrhtFpTZBvYQgvZaHS/qs4Ix6dR3/gsAfQGA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QBlJgYFp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QBlJgYFp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FB39C4CECD; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728137029; bh=hDQvcu8Vv8Wg91smOeEWxvTb4XmEDvotaoUWgxTSX/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QBlJgYFpEbOIGLtmHDB/defiNklHrvvwThnhUMa9ZToetGA+MESt6BRF/8P0sqXRT 1C8ayD4yOEFpx1JCimbF9er21qiprU7c4QByfSTTbZxVQLiZS77bz1JDGrzQXXM50P x+cjS2iNkvuwN09SVwWJUHMotfGWeWitsb27HoiVSBkIN6QloJt00gMas0037IhdZF 1YR3yHPPBuI6Ipo/rC7NJdkCjPaY3z+RAakZIA9Nem6di+TMzO//ujaRmznM+VkVLX emop2Uy4/9+4ns8PUWoO/3Crx0DkyUHo4jvDrPUI/kPxhfV2q3RrpP9CVX26HBZNgB Jd455QMzCdOig== Received: by pali.im (Postfix) id D135A9F7; Sat, 5 Oct 2024 16:03:42 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] cifs: Fix creating native symlinks pointing to current or parent directory Date: Sat, 5 Oct 2024 16:02:56 +0200 Message-Id: <20241005140300.19416-3-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241005140300.19416-1-pali@kernel.org> References: <20240929185053.10554-1-pali@kernel.org> <20241005140300.19416-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Calling 'ln -s . symlink' or 'ln -s .. symlink' creates symlink pointing to some object name which ends with U+F029 unicode codepoint. This is because trailing dot in the object name is replaced by non-ASCII unicode codepoint. So Linux SMB client currently is not able to create native symlink pointing to current or parent directory on Windows SMB server which can be read by either on local Windows server or by any other SMB client which does not implement compatible-reverse character replacement. Fix this problem in cifsConvertToUTF16() function which is doing that character replacement. Function comment already says that it does not need to handle special cases '.' and '..', but after introduction of native symlinks in reparse point form, this handling is needed. Note that this change depends on the previous change "cifs: Improve creating native symlinks pointing to directory". Signed-off-by: Pali Roh=C3=A1r --- fs/smb/client/cifs_unicode.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/fs/smb/client/cifs_unicode.c b/fs/smb/client/cifs_unicode.c index 79d99a913944..4cc6e0896fad 100644 --- a/fs/smb/client/cifs_unicode.c +++ b/fs/smb/client/cifs_unicode.c @@ -484,10 +484,21 @@ cifsConvertToUTF16(__le16 *target, const char *source= , int srclen, /** * Remap spaces and periods found at the end of every * component of the path. The special cases of '.' and - * '..' do not need to be dealt with explicitly because - * they are addressed in namei.c:link_path_walk(). + * '..' are need to be handled because of symlinks. + * They are treated as non-end-of-string to avoid + * remapping and breaking symlinks pointing to . or .. **/ - if ((i =3D=3D srclen - 1) || (source[i+1] =3D=3D '\\')) + if ((i =3D=3D 0 || source[i-1] =3D=3D '\\') && + source[i] =3D=3D '.' && + (i =3D=3D srclen-1 || source[i+1] =3D=3D '\\')) + end_of_string =3D false; /* "." case */ + else if (i >=3D 1 && + (i =3D=3D 1 || source[i-2] =3D=3D '\\') && + source[i-1] =3D=3D '.' && + source[i] =3D=3D '.' && + (i =3D=3D srclen-1 || source[i+1] =3D=3D '\\')) + end_of_string =3D false; /* ".." case */ + else if ((i =3D=3D srclen - 1) || (source[i+1] =3D=3D '\\')) end_of_string =3D true; else end_of_string =3D false; --=20 2.20.1 From nobody Thu Nov 28 01:31:10 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E72EC1F19A; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; cv=none; b=Vc4NI4ijJZSS3/6+gDLyNvpM+VtTJ1VU4SQQVXjtV/DKYMoZ06i+ZFqLJ4qu95+imUehWAdADSZIaYk21/mZyaB8pjyTuNcxLmGBoEegbik0Rffutot1H+B2OVqbaI+vttGTuHMn3uj/qh8Nl1R1Xb6PJT9bmxzcDue55DwWLaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; c=relaxed/simple; bh=S6HYcLfijvOqTM13PxgG/z9ct4kBTgHVZpvHru4R4Qw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hfCk50k2evVBup0jbI/7EhFtPe/++CnP2geJHXlw1Uuj8mtmVWeW3m2kawKhIq874F66QFemr84DJ+X6GndRG+SxkFuGb6nr46hMzBeY++CTNDTd+E1y4yFoIJNczZLQsMExd5/ejuxnSBj72iyhRE/QWHmtSv5kr9ckOqiH3I8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VmCz/r+L; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VmCz/r+L" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5AFBBC4CED0; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728137029; bh=S6HYcLfijvOqTM13PxgG/z9ct4kBTgHVZpvHru4R4Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VmCz/r+LHD4DJLkdLAgpI68pRqkxjF6mHXgwsNE8J7WS3dZIYp3Cd8ME/uYsL34bK LThP/hJT9b5v8WVw/7xyo6pVfre9xn0b7002xxvM2pMRLymiXjFKeTUluQL59H1ArE fYv21ZCOeDMTclwE6mP9ADlfeZgQ5s+VcSV3gXhbcawp6ZMW91cY8ZC63C6LDb1cev ytbRXTHG50cnV8UvcOhfYtivcmqGALOW+EyzCQcnNIHVUL9ueS3R4vOrlAKbxfZn7x NPZ8UuuZUIpwvnsbM/O2zIrhbYNXykkVasUYQZ4XWEvKR7fAsU6LgZ2xd8aDrMOreY kDzJBh59VxG0Q== Received: by pali.im (Postfix) id 0AC03A4E; Sat, 5 Oct 2024 16:03:43 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/6] cifs: Fix parsing native symlinks relative to the export Date: Sat, 5 Oct 2024 16:02:57 +0200 Message-Id: <20241005140300.19416-4-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241005140300.19416-1-pali@kernel.org> References: <20240929185053.10554-1-pali@kernel.org> <20241005140300.19416-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable SMB symlink which has SYMLINK_FLAG_RELATIVE set is relative (as opposite of the absolute) and it can be relative either to the current directory (where is the symlink stored) or relative to the top level export path. To what it is relative depends on the first character of the symlink target path. If the first character is path separator then symlink is relative to the export, otherwise to the current directory. Linux (and generally POSIX systems) supports only symlink paths relative to the current directory where is symlink stored. Currently if Linux SMB client reads relative SMB symlink with first character as path separator (slash), it let as is. Which means that Linux interpret it as absolute symlink pointing from the root (/). But this location is different than the top level directory of SMB export (unless SMB export was mounted to the root) and thefore SMB symlinks relative to the export are interpreted wrongly by Linux SMB client. Fix this problem. As Linux does not have equivalent of the path relative to the top of the mount point, convert such symlink target path relative to the current directory. Do this by prepending "../" pattern N times before the SMB target path, where N is the number of path separators found in SMB symlink path. So for example, if SMB share is mounted to Linux path /mnt/share/, symlink is stored in file /mnt/share/test/folder1/symlink (so SMB symlink path is test\folder1\symlink) and SMB symlink target points to \test\folder2\file, then convert symlink target path to Linux path ../../test/folder2/file. Deduplicate code for parsing SMB symlinks in native form from functions smb2_parse_symlink_response() and parse_reparse_native_symlink() into new function smb2_parse_native_symlink() and pass into this new function a new full_path parameter from callers, which specify SMB full path where is symlink stored. This change fixes resolving of the native Windows symlinks relative to the top level directory of the SMB share. Signed-off-by: Pali Roh=C3=A1r --- fs/smb/client/cifsglob.h | 1 + fs/smb/client/cifsproto.h | 1 + fs/smb/client/inode.c | 1 + fs/smb/client/reparse.c | 90 +++++++++++++++++++++++++++++++++------ fs/smb/client/reparse.h | 4 +- fs/smb/client/smb1ops.c | 3 +- fs/smb/client/smb2file.c | 21 +++++---- fs/smb/client/smb2inode.c | 6 ++- fs/smb/client/smb2proto.h | 9 +++- 9 files changed, 108 insertions(+), 28 deletions(-) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 9eae8649f90c..260b553283ef 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -589,6 +589,7 @@ struct smb_version_operations { /* Check for STATUS_NETWORK_NAME_DELETED */ bool (*is_network_name_deleted)(char *buf, struct TCP_Server_Info *srv); int (*parse_reparse_point)(struct cifs_sb_info *cifs_sb, + const char *full_path, struct kvec *rsp_iov, struct cifs_open_info_data *data); int (*create_reparse_symlink)(const unsigned int xid, diff --git a/fs/smb/client/cifsproto.h b/fs/smb/client/cifsproto.h index 791bddac0396..44555a0e4df6 100644 --- a/fs/smb/client/cifsproto.h +++ b/fs/smb/client/cifsproto.h @@ -675,6 +675,7 @@ char *extract_hostname(const char *unc); char *extract_sharename(const char *unc); int parse_reparse_point(struct reparse_data_buffer *buf, u32 plen, struct cifs_sb_info *cifs_sb, + const char *full_path, bool unicode, struct cifs_open_info_data *data); int __cifs_sfu_make_node(unsigned int xid, struct inode *inode, struct dentry *dentry, struct cifs_tcon *tcon, diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c index 0c23634438e5..0fe54b2d2561 100644 --- a/fs/smb/client/inode.c +++ b/fs/smb/client/inode.c @@ -1107,6 +1107,7 @@ static int reparse_info_to_fattr(struct cifs_open_inf= o_data *data, rc =3D 0; } else if (iov && server->ops->parse_reparse_point) { rc =3D server->ops->parse_reparse_point(cifs_sb, + full_path, iov, data); } break; diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index 8403e1b94059..0d1cea64ab6e 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -532,9 +532,76 @@ static int parse_reparse_posix(struct reparse_posix_da= ta *buf, return 0; } =20 +int smb2_parse_native_symlink(char **target, const char *buf, unsigned int= len, + bool unicode, bool relative, + const char *full_path, + struct cifs_sb_info *cifs_sb) +{ + char sep =3D CIFS_DIR_SEP(cifs_sb); + char *linux_target =3D NULL; + char *smb_target =3D NULL; + int levels; + int rc; + int i; + + smb_target =3D cifs_strndup_from_utf16(buf, len, unicode, cifs_sb->local_= nls); + if (!smb_target) { + rc =3D -ENOMEM; + goto out; + } + + if (smb_target[0] =3D=3D sep && relative) { + /* + * This is a relative SMB symlink from the top of the share, + * which is the top level directory of the Linux mount point. + * Linux does not support such relative symlinks, so convert + * it to the relative symlink from the current directory. + * full_path is the SMB path to the symlink (from which is + * extracted current directory) and smb_target is the SMB path + * where symlink points, therefore full_path must always be on + * the SMB share. + */ + int smb_target_len =3D strlen(smb_target)+1; + levels =3D 0; + for (i =3D 1; full_path[i]; i++) { /* i=3D1 to skip leading sep */ + if (full_path[i] =3D=3D sep) + levels++; + } + linux_target =3D kmalloc(levels*3 + smb_target_len, GFP_KERNEL); + if (!linux_target) { + rc =3D -ENOMEM; + goto out; + } + for (i =3D 0; i < levels; i++) { + linux_target[i*3 + 0] =3D '.'; + linux_target[i*3 + 1] =3D '.'; + linux_target[i*3 + 2] =3D sep; + } + memcpy(linux_target + levels*3, smb_target+1, smb_target_len); /* +1 to = skip leading sep */ + } else { + linux_target =3D smb_target; + smb_target =3D NULL; + } + + if (sep =3D=3D '\\') + convert_delimiter(linux_target, '/'); + + rc =3D 0; + *target =3D linux_target; + + cifs_dbg(FYI, "%s: symlink target: %s\n", __func__, *target); + +out: + if (rc !=3D 0) + kfree(linux_target); + kfree(smb_target); + return rc; +} + static int parse_reparse_symlink(struct reparse_symlink_data_buffer *sym, u32 plen, bool unicode, struct cifs_sb_info *cifs_sb, + const char *full_path, struct cifs_open_info_data *data) { unsigned int len; @@ -549,20 +616,18 @@ static int parse_reparse_symlink(struct reparse_symli= nk_data_buffer *sym, return -EIO; } =20 - data->symlink_target =3D cifs_strndup_from_utf16(sym->PathBuffer + offs, - len, unicode, - cifs_sb->local_nls); - if (!data->symlink_target) - return -ENOMEM; - - convert_delimiter(data->symlink_target, '/'); - cifs_dbg(FYI, "%s: target path: %s\n", __func__, data->symlink_target); - - return 0; + return smb2_parse_native_symlink(&data->symlink_target, + sym->PathBuffer + offs, + len, + unicode, + le32_to_cpu(sym->Flags) & SYMLINK_FLAG_RELATIVE, + full_path, + cifs_sb); } =20 int parse_reparse_point(struct reparse_data_buffer *buf, u32 plen, struct cifs_sb_info *cifs_sb, + const char *full_path, bool unicode, struct cifs_open_info_data *data) { struct cifs_tcon *tcon =3D cifs_sb_master_tcon(cifs_sb); @@ -577,7 +642,7 @@ int parse_reparse_point(struct reparse_data_buffer *buf, case IO_REPARSE_TAG_SYMLINK: return parse_reparse_symlink( (struct reparse_symlink_data_buffer *)buf, - plen, unicode, cifs_sb, data); + plen, unicode, cifs_sb, full_path, data); case IO_REPARSE_TAG_LX_SYMLINK: case IO_REPARSE_TAG_AF_UNIX: case IO_REPARSE_TAG_LX_FIFO: @@ -593,6 +658,7 @@ int parse_reparse_point(struct reparse_data_buffer *buf, } =20 int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb, + const char *full_path, struct kvec *rsp_iov, struct cifs_open_info_data *data) { @@ -602,7 +668,7 @@ int smb2_parse_reparse_point(struct cifs_sb_info *cifs_= sb, =20 buf =3D (struct reparse_data_buffer *)((u8 *)io + le32_to_cpu(io->OutputOffset)); - return parse_reparse_point(buf, plen, cifs_sb, true, data); + return parse_reparse_point(buf, plen, cifs_sb, full_path, true, data); } =20 static void wsl_to_fattr(struct cifs_open_info_data *data, diff --git a/fs/smb/client/reparse.h b/fs/smb/client/reparse.h index 5be54878265e..eb6854e65e08 100644 --- a/fs/smb/client/reparse.h +++ b/fs/smb/client/reparse.h @@ -128,7 +128,9 @@ int smb2_create_reparse_symlink(const unsigned int xid,= struct inode *inode, int smb2_mknod_reparse(unsigned int xid, struct inode *inode, struct dentry *dentry, struct cifs_tcon *tcon, const char *full_path, umode_t mode, dev_t dev); -int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb, struct kvec *rs= p_iov, +int smb2_parse_reparse_point(struct cifs_sb_info *cifs_sb, + const char *full_path, + struct kvec *rsp_iov, struct cifs_open_info_data *data); =20 #endif /* _CIFS_REPARSE_H */ diff --git a/fs/smb/client/smb1ops.c b/fs/smb/client/smb1ops.c index e03c91a49650..fed32db32a46 100644 --- a/fs/smb/client/smb1ops.c +++ b/fs/smb/client/smb1ops.c @@ -994,6 +994,7 @@ static int cifs_query_symlink(const unsigned int xid, } =20 static int cifs_parse_reparse_point(struct cifs_sb_info *cifs_sb, + const char *full_path, struct kvec *rsp_iov, struct cifs_open_info_data *data) { @@ -1004,7 +1005,7 @@ static int cifs_parse_reparse_point(struct cifs_sb_in= fo *cifs_sb, =20 buf =3D (struct reparse_data_buffer *)((__u8 *)&io->hdr.Protocol + le32_to_cpu(io->DataOffset)); - return parse_reparse_point(buf, plen, cifs_sb, unicode, data); + return parse_reparse_point(buf, plen, cifs_sb, full_path, unicode, data); } =20 static bool diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c index c23478ab1cf8..dc52995f5591 100644 --- a/fs/smb/client/smb2file.c +++ b/fs/smb/client/smb2file.c @@ -63,12 +63,12 @@ static struct smb2_symlink_err_rsp *symlink_data(const = struct kvec *iov) return sym; } =20 -int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct= kvec *iov, char **path) +int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct= kvec *iov, + const char *full_path, char **path) { struct smb2_symlink_err_rsp *sym; unsigned int sub_offs, sub_len; unsigned int print_offs, print_len; - char *s; =20 if (!cifs_sb || !iov || !iov->iov_base || !iov->iov_len || !path) return -EINVAL; @@ -86,15 +86,13 @@ int smb2_parse_symlink_response(struct cifs_sb_info *ci= fs_sb, const struct kvec iov->iov_len < SMB2_SYMLINK_STRUCT_SIZE + print_offs + print_len) return -EINVAL; =20 - s =3D cifs_strndup_from_utf16((char *)sym->PathBuffer + sub_offs, sub_len= , true, - cifs_sb->local_nls); - if (!s) - return -ENOMEM; - convert_delimiter(s, '/'); - cifs_dbg(FYI, "%s: symlink target: %s\n", __func__, s); - - *path =3D s; - return 0; + return smb2_parse_native_symlink(path, + (char *)sym->PathBuffer + sub_offs, + sub_len, + true, + le32_to_cpu(sym->Flags) & SYMLINK_FLAG_RELATIVE, + full_path, + cifs_sb); } =20 int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,= __u32 *oplock, void *buf) @@ -126,6 +124,7 @@ int smb2_open_file(const unsigned int xid, struct cifs_= open_parms *oparms, __u32 goto out; if (hdr->Status =3D=3D STATUS_STOPPED_ON_SYMLINK) { rc =3D smb2_parse_symlink_response(oparms->cifs_sb, &err_iov, + oparms->path, &data->symlink_target); if (!rc) { memset(smb2_data, 0, sizeof(*smb2_data)); diff --git a/fs/smb/client/smb2inode.c b/fs/smb/client/smb2inode.c index cdb0e028e73c..9a28a30ec1a3 100644 --- a/fs/smb/client/smb2inode.c +++ b/fs/smb/client/smb2inode.c @@ -828,6 +828,7 @@ static int smb2_compound_op(const unsigned int xid, str= uct cifs_tcon *tcon, =20 static int parse_create_response(struct cifs_open_info_data *data, struct cifs_sb_info *cifs_sb, + const char *full_path, const struct kvec *iov) { struct smb2_create_rsp *rsp =3D iov->iov_base; @@ -841,6 +842,7 @@ static int parse_create_response(struct cifs_open_info_= data *data, break; case STATUS_STOPPED_ON_SYMLINK: rc =3D smb2_parse_symlink_response(cifs_sb, iov, + full_path, &data->symlink_target); if (rc) return rc; @@ -930,14 +932,14 @@ int smb2_query_path_info(const unsigned int xid, =20 switch (rc) { case 0: - rc =3D parse_create_response(data, cifs_sb, &out_iov[0]); + rc =3D parse_create_response(data, cifs_sb, full_path, &out_iov[0]); break; case -EOPNOTSUPP: /* * BB TODO: When support for special files added to Samba * re-verify this path. */ - rc =3D parse_create_response(data, cifs_sb, &out_iov[0]); + rc =3D parse_create_response(data, cifs_sb, full_path, &out_iov[0]); if (rc || !data->reparse_point) goto out; =20 diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h index 5e0855fefcfe..aa01ae234732 100644 --- a/fs/smb/client/smb2proto.h +++ b/fs/smb/client/smb2proto.h @@ -113,7 +113,14 @@ extern int smb3_query_mf_symlink(unsigned int xid, str= uct cifs_tcon *tcon, struct cifs_sb_info *cifs_sb, const unsigned char *path, char *pbuf, unsigned int *pbytes_read); -int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, const struct= kvec *iov, char **path); +int smb2_parse_native_symlink(char **target, const char *buf, unsigned int= len, + bool unicode, bool relative, + const char *full_path, + struct cifs_sb_info *cifs_sb); +int smb2_parse_symlink_response(struct cifs_sb_info *cifs_sb, + const struct kvec *iov, + const char *full_path, + char **path); int smb2_open_file(const unsigned int xid, struct cifs_open_parms *oparms,= __u32 *oplock, void *buf); extern int smb2_unlock_range(struct cifsFileInfo *cfile, --=20 2.20.1 From nobody Thu Nov 28 01:31:10 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E73311386DA; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; cv=none; b=QAZkuOBigNrIOJG6jcpHPIwl44aJHRoFFZBq0RQxyOilgzpWMNmThzb67ZTK+mu6skZ8CVdQcmLX5PjFvt++/62Urz8xim3JaLIxaWWDckSgpp8NH9zAA0k94KqCSE4NsogScAmagJ7Ftq79r52PuVLtaXpD0z8pCgPqykhrErQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; c=relaxed/simple; bh=hck5M9wUtffvOEh9wksTxAhJ0N0lXGbIC6gxgJiS+hQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=HYyxZJlRFP2nVEUJ2UzateqARWvpFK95NaiLVIipYLNzqHvQUxMCxAM76qLf08XrdRypVSEuUPm+mRQqV/VKrsPnrrD/7rL8AnUT5dPtZMeGWgSrKmgrupyyWw3Jq8PLe09i9veb0xTQIe0jCXVXKOvCW4fZPdRAq6fKST21iYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MJQHR4BY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MJQHR4BY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66089C4CED1; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728137029; bh=hck5M9wUtffvOEh9wksTxAhJ0N0lXGbIC6gxgJiS+hQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJQHR4BY3S1Pp4nP3vbtIOI9l2NkGfVVxAT6/y6d1lrp9DKvD2CfnVAPKUVr765Q+ tCzUmJYkhLmfSIl1uk3y4VrMpMxmpXrXjE7nnzT3x6EzMgxc4MRUUbgdVPR25XBm74 fjl3SsmHa2yuXnvoxN834oBPCFrq1M5gRX/IpDHl/6bzVE0sgoE8zgsjn+YmzmHODG qFQHNoH29E4sdrX+rwfGJw7b5TCI59zjbhiOk/xOBzs9tNsD2kO0g91a978EexjhDf Y+ImCTruKzBUPl83hFBdZAxvw4CSn+PaRhgRHl+26R7UGW6eV1PqyF+oefkh0F5YrD CQqNDtJBfDwjQ== Received: by pali.im (Postfix) id 37086B64; Sat, 5 Oct 2024 16:03:43 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/6] cifs: Fix parsing native symlinks directory/file type Date: Sat, 5 Oct 2024 16:02:58 +0200 Message-Id: <20241005140300.19416-5-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241005140300.19416-1-pali@kernel.org> References: <20240929185053.10554-1-pali@kernel.org> <20241005140300.19416-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=A1r --- fs/smb/client/inode.c | 5 ++++ fs/smb/client/smb2file.c | 55 +++++++++++++++++++++++++++++++++++++++ fs/smb/client/smb2inode.c | 4 +++ fs/smb/client/smb2proto.h | 1 + 4 files changed, 65 insertions(+) diff --git a/fs/smb/client/inode.c b/fs/smb/client/inode.c index 0fe54b2d2561..aa38a3935f8f 100644 --- a/fs/smb/client/inode.c +++ b/fs/smb/client/inode.c @@ -1110,6 +1110,11 @@ static int reparse_info_to_fattr(struct cifs_open_in= fo_data *data, full_path, iov, data); } + + if (data->reparse.tag =3D=3D IO_REPARSE_TAG_SYMLINK && !rc) { + bool directory =3D le32_to_cpu(data->fi.Attributes) & ATTR_DIRECTORY; + rc =3D smb2_fix_symlink_target_type(&data->symlink_target, directory, c= ifs_sb); + } break; } =20 diff --git a/fs/smb/client/smb2file.c b/fs/smb/client/smb2file.c index dc52995f5591..149449d9c1c0 100644 --- a/fs/smb/client/smb2file.c +++ b/fs/smb/client/smb2file.c @@ -63,6 +63,56 @@ static struct smb2_symlink_err_rsp *symlink_data(const s= truct kvec *iov) return sym; } =20 +int smb2_fix_symlink_target_type(char **target, bool directory, struct cif= s_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; + + len =3D 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] !=3D '/') { + buf =3D kzalloc(len+2, GFP_KERNEL); + if (!buf) + return -ENOMEM; + memcpy(buf, *target, len); + buf[len] =3D '/'; + kfree(*target); + *target =3D buf; + } + + /* + * If this is a symlink which points to file name with trailing slash, + * or to file named "." or file named ".." then this symlink cannot be + * resolved on Linux because Linux does not allow files with such names. + * So return an error to prevent resolving this file type symlink to + * directory, as it do not point to directory at all. + */ + if (!directory) { + const char *basename =3D kbasename(*target); + int basename_len =3D strlen(basename); + if (basename_len =3D=3D 0 || /* symname ends with slash */ + (basename_len =3D=3D 1 && basename[0] =3D=3D '.') || /* last compone= nt is "." */ + (basename_len =3D=3D 2 && basename[0] =3D=3D '.' && basename[1] =3D= =3D '.')) /* or ".." */ + 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) { @@ -133,6 +183,11 @@ int smb2_open_file(const unsigned int xid, struct cifs= _open_parms *oparms, __u32 NULL, NULL, NULL); oparms->create_options &=3D ~OPEN_REPARSE_POINT; } + if (!rc) { + bool directory =3D le32_to_cpu(data->fi.Attributes) & ATTR_DIRECTORY; + rc =3D smb2_fix_symlink_target_type(&data->symlink_target, + directory, oparms->cifs_sb); + } } } =20 diff --git a/fs/smb/client/smb2inode.c b/fs/smb/client/smb2inode.c index 9a28a30ec1a3..06bb6f7fbf0f 100644 --- a/fs/smb/client/smb2inode.c +++ b/fs/smb/client/smb2inode.c @@ -960,6 +960,10 @@ int smb2_query_path_info(const unsigned int xid, rc =3D smb2_compound_op(xid, tcon, cifs_sb, full_path, &oparms, in_iov, cmds, num_cmds, cfile, NULL, NULL, NULL); + if (data->reparse.tag =3D=3D IO_REPARSE_TAG_SYMLINK && !rc) { + bool directory =3D le32_to_cpu(data->fi.Attributes) & ATTR_DIRECTORY; + rc =3D smb2_fix_symlink_target_type(&data->symlink_target, directory, c= ifs_sb); + } break; case -EREMOTE: break; diff --git a/fs/smb/client/smb2proto.h b/fs/smb/client/smb2proto.h index aa01ae234732..1828b825c7d3 100644 --- a/fs/smb/client/smb2proto.h +++ b/fs/smb/client/smb2proto.h @@ -113,6 +113,7 @@ extern int smb3_query_mf_symlink(unsigned int xid, stru= ct 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 cif= s_sb_info *cifs_sb); int smb2_parse_native_symlink(char **target, const char *buf, unsigned int= len, bool unicode, bool relative, const char *full_path, --=20 2.20.1 From nobody Thu Nov 28 01:31:10 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E20921E86F; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; cv=none; b=s2umS/C2mk9l/c9onR3VcemKJez6WhN6GZO4N6XhIG9V+z2n9xPxdgcV/ttxAyR+plprVm+nGy6y2yC2bnSQSutwcAQjsLD5c+WLDgzAQXEN9ocvKmsRMaW9Xp0MuG5thQbAo+XjL40/rSXPiWVdO8DRNnjgJQqvMxEe2NDcNC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; c=relaxed/simple; bh=1EMZDsuMmDkNSxzMQAtXAHiCdyxZsiTk4Nmrsli0tuk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=HPDgGJFM0mIwOFLLeehlnDW6lRJYpcS3If2K5n21KrPg0SrDSGUHsZAuS8TzeJfuPXTpz/gkwvUtTZu9SpxVCkLLVVtcVsmr39wvvSWiosgYiX5SVAQksxqmZ0fblpkHx02Y+a2/dW/DDTyJIyrANoKCM8bRuzscFaaVadUEdww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HhxfOchs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HhxfOchs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A091CC4CECE; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728137029; bh=1EMZDsuMmDkNSxzMQAtXAHiCdyxZsiTk4Nmrsli0tuk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HhxfOchs2x7rdAc41/vhNzFyblJmqxFOEINclT8k+med1BkTR6SQEz2cja6OoAFxB hJ4qdwnGcs3nM+ZnvGICHZUVuPzDLBJ3J0xLZKApb//KjXX6AHnwFIVfmtl21JBz5S jtkM24pZRvFuoijbMGItBIApSlIo2nLCLH+rLWaJa+dW5RTELeSnhBKmq+Q0cYpIGH soNq2vpxCHzVUNn/9+/Ge5uCkg71PmOanAe1lmcXVmKWrqXMngt6seNj2SctKX/0sR K4vUZ94loW/FyfXH+R9SD2hM0C252061laHabiOfPAS6APRa5y2LcE6YPXEuBtoaak OELDXEjN41sew== Received: by pali.im (Postfix) id 6E7D5BA8; Sat, 5 Oct 2024 16:03:43 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/6] cifs: Validate content of native symlink Date: Sat, 5 Oct 2024 16:02:59 +0200 Message-Id: <20241005140300.19416-6-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241005140300.19416-1-pali@kernel.org> References: <20240929185053.10554-1-pali@kernel.org> <20241005140300.19416-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Check that path buffer has correct length (it is non-zero and in UNICODE mode it has even number of bytes) and check that buffer does not contain null character (UTF-16 null codepoint in UNICODE mode or null byte in non-unicode mode) because Linux cannot process symlink with null byte. Signed-off-by: Pali Roh=C3=A1r --- fs/smb/client/reparse.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index 0d1cea64ab6e..fb1d16b17f38 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -544,6 +544,25 @@ int smb2_parse_native_symlink(char **target, const cha= r *buf, unsigned int len, int rc; int i; =20 + /* Check that length it valid for unicode/non-unicode mode */ + if (!len || (unicode && (len % 2))) { + cifs_dbg(VFS, "srv returned malformed symlink buffer\n"); + rc =3D -EIO; + goto out; + } + + /* + * Check that buffer does not contain UTF-16 null codepoint in unicode + * mode or null byte in non-unicode mode because Linux cannot process + * symlink with null byte. + */ + if ((unicode && UniStrnlen((wchar_t *)buf, len/2) !=3D len/2) || + (!unicode && strnlen(buf, len) !=3D len)) { + cifs_dbg(VFS, "srv returned null byte in native symlink target location\= n"); + rc =3D -EIO; + goto out; + } + smb_target =3D cifs_strndup_from_utf16(buf, len, unicode, cifs_sb->local_= nls); if (!smb_target) { rc =3D -ENOMEM; --=20 2.20.1 From nobody Thu Nov 28 01:31:10 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DA601552E0; Sat, 5 Oct 2024 14:03:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; cv=none; b=jeww63jVFFCfmlpLCfC78RfceIxp6tlP33k5oCfsDJyn94DM+Dr+LKWfzM4d9EzaYHdvY4fQlI3jv3k0AHbq0ATYQItwT/UZ/nEIlX8TvFrNfb6SMaDOzfdloMy9rFwx2kbB9z+Nxu9/4dBxtrebaJKsKORa8nKSlxJUTXVu1Pc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728137030; c=relaxed/simple; bh=MyC0APpWdC5xOlJrzlhdluEMxW+Ky8LVCXVC93YNZyU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=TOYXyBpUj1VKcwOMc4bhlnzb5ciRdJu5GflfKtBsZK5AnvLYyqDOsFD4zr7yB4rw+DuGpXxEzcFR9O3Sf4ruwB0/HSyDu2wpbWkdbPAJUDbye/hpbLPjKC/+Ivx9Hb6hptZWc8Mb3UHr2jiWmoEO97a+icj3CN4tiZP2k8QXfbA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TLTGMNL6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TLTGMNL6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCA3FC4CEC2; Sat, 5 Oct 2024 14:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728137030; bh=MyC0APpWdC5xOlJrzlhdluEMxW+Ky8LVCXVC93YNZyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TLTGMNL6JlN4vDoAiaLj9gBSelCreSWY3NCQeyp6LNmx69apJfi6OxMnv/yhtdVMv k7npRKmySiaQnu7yEXFeXo3AW9vTB1f8swApGhKlIwIvmJ6AiDkjYLJBsMrmkAb4t/ e7VTyUK7lQajU5w0n9bswk4rZ3rYIEJ998iHKqkfgAkpThsvo9lb3LCjroYEz/O4um ocORkpoULPBo1rXD5/mf/GTrcxUAIwFFw6yZofPX4A+JZVwuDv6uuUHtkFK2JgcOl3 oQbcsgwEcP9XY8sCXdxsMqUiLamdzRVzGVU9JwCN1fEnakEVykhjHmVPd9XBu5noLm k3YYFU7YMHsaA== Received: by pali.im (Postfix) id B86B8C46; Sat, 5 Oct 2024 16:03:43 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Steve French , Paulo Alcantara , Ronnie Sahlberg Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 6/6] cifs: Fix creating and resolving absolute NT-style symlinks Date: Sat, 5 Oct 2024 16:03:00 +0200 Message-Id: <20241005140300.19416-7-pali@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241005140300.19416-1-pali@kernel.org> References: <20240929185053.10554-1-pali@kernel.org> <20241005140300.19416-1-pali@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable If the SMB symlink is stored on NT server in absolute form then it points to the NT object hierarchy, which is different from POSIX one and needs some conversion / mapping. To make interoperability with Windows SMB server and WSL subsystem, reuse its logic of mapping between NT paths and POSIX paths into Linux SMB client. WSL subsystem on Windows uses for -t drvfs mount option -o symlinkroot=3D which specifies the POSIX path where are expected to be mounted lowercase Windows drive letters (without colon). Do same for Linux SMB client and add a new mount option -o symlinkroot=3D which mimics the drvfs mount option of the same name. It specifies where in the Linux VFS hierarchy is the root of the DOS / Windows drive letters, and translates between absolute NT-style symlinks and absolute Linux VFS symlinks. Default value of symlinkroot is "/mnt", same what is using WSL. Note that DOS / Windows drive letter symlinks are just subset of all possible NT-style symlinks. Drive letters live in NT subtree \??\ and important details about NT paths and object hierarchy are in the comments in this change. When symlink target location from non-POSIX SMB server is in absolute form (indicated by absence of SYMLINK_FLAG_RELATIVE) then it is converted to Linux absolute symlink according to symlinkroot configuration. And when creating a new symlink on non-POSIX SMB server in absolute form then Linux absolute target is converted to NT-style according to symlinkroot configuration. When SMB server is POSIX, then this change does not affect neither reading target location of symlink, nor creating a new symlink. It is expected that POSIX SMB server works with POSIX paths where the absolute root is /. This change improves interoperability of absolute SMB symlinks with Windows SMB servers. Signed-off-by: Pali Roh=C3=A1r --- fs/smb/client/fs_context.c | 22 +++ fs/smb/client/fs_context.h | 2 + fs/smb/client/reparse.c | 267 ++++++++++++++++++++++++++++++++++--- 3 files changed, 273 insertions(+), 18 deletions(-) diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c index 2f0c3894b0f7..22b550860cc8 100644 --- a/fs/smb/client/fs_context.c +++ b/fs/smb/client/fs_context.c @@ -178,6 +178,7 @@ const struct fs_parameter_spec smb3_fs_parameters[] =3D= { fsparam_string("sec", Opt_sec), fsparam_string("cache", Opt_cache), fsparam_string("reparse", Opt_reparse), + fsparam_string("symlinkroot", Opt_symlinkroot), =20 /* Arguments that should be ignored */ fsparam_flag("guest", Opt_ignore), @@ -355,6 +356,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, st= ruct smb3_fs_context *ctx new_ctx->source =3D NULL; new_ctx->iocharset =3D NULL; new_ctx->leaf_fullpath =3D NULL; + new_ctx->symlinkroot =3D NULL; /* * Make sure to stay in sync with smb3_cleanup_fs_context_contents() */ @@ -369,6 +371,7 @@ smb3_fs_context_dup(struct smb3_fs_context *new_ctx, st= ruct smb3_fs_context *ctx DUP_CTX_STR(nodename); DUP_CTX_STR(iocharset); DUP_CTX_STR(leaf_fullpath); + DUP_CTX_STR(symlinkroot); =20 return 0; } @@ -1614,9 +1617,26 @@ static int smb3_fs_context_parse_param(struct fs_con= text *fc, if (parse_reparse_flavor(fc, param->string, ctx)) goto cifs_parse_mount_err; break; + case Opt_symlinkroot: + if (param->string[0] !=3D '/') { + cifs_errorf(fc, "symlinkroot mount options must be absolute path\n"); + goto cifs_parse_mount_err; + } + kfree(ctx->symlinkroot); + ctx->symlinkroot =3D kstrdup(param->string, GFP_KERNEL); + if (!ctx->symlinkroot) + goto cifs_parse_mount_err; + break; } /* case Opt_ignore: - is ignored as expected ... */ =20 + /* + * By default resolve all native absolute symlinks relative to "/mnt/". + * Same default has drvfs driver running in WSL for resolving SMB shares. + */ + if (!ctx->symlinkroot) + ctx->symlinkroot =3D kstrdup("/mnt/", GFP_KERNEL); + return 0; =20 cifs_parse_mount_err: @@ -1747,6 +1767,8 @@ smb3_cleanup_fs_context_contents(struct smb3_fs_conte= xt *ctx) ctx->prepath =3D NULL; kfree(ctx->leaf_fullpath); ctx->leaf_fullpath =3D NULL; + kfree(ctx->symlinkroot); + ctx->symlinkroot =3D NULL; } =20 void diff --git a/fs/smb/client/fs_context.h b/fs/smb/client/fs_context.h index cf577ec0dd0a..8dd12498ffd8 100644 --- a/fs/smb/client/fs_context.h +++ b/fs/smb/client/fs_context.h @@ -157,6 +157,7 @@ enum cifs_param { Opt_sec, Opt_cache, Opt_reparse, + Opt_symlinkroot, =20 /* Mount options to be ignored */ Opt_ignore, @@ -284,6 +285,7 @@ struct smb3_fs_context { struct cifs_ses *dfs_root_ses; bool dfs_automount:1; /* set for dfs automount only */ enum cifs_reparse_type reparse_type; + char *symlinkroot; /* top level directory for native SMB symlinks in abso= lute format */ }; =20 extern const struct fs_parameter_spec smb3_fs_parameters[]; diff --git a/fs/smb/client/reparse.c b/fs/smb/client/reparse.c index fb1d16b17f38..a577b2d2a4fc 100644 --- a/fs/smb/client/reparse.c +++ b/fs/smb/client/reparse.c @@ -25,33 +25,128 @@ int smb2_create_reparse_symlink(const unsigned int xid= , struct inode *inode, const char *full_path, const char *symname) { struct reparse_symlink_data_buffer *buf =3D NULL; - struct cifs_open_info_data data; + struct cifs_open_info_data data =3D {}; struct cifs_sb_info *cifs_sb =3D CIFS_SB(inode->i_sb); struct inode *new; struct kvec iov; - __le16 *path; + __le16 *path =3D NULL; bool directory; - char *sym, sep =3D CIFS_DIR_SEP(cifs_sb); - u16 len, plen; + char *symlink_target =3D NULL; + char *sym =3D NULL; + char sep =3D CIFS_DIR_SEP(cifs_sb); + u16 len, plen, poff, slen; int rc =3D 0; =20 - sym =3D kstrdup(symname, GFP_KERNEL); - if (!sym) - return -ENOMEM; + symlink_target =3D kstrdup(symname, GFP_KERNEL); + if (!symlink_target) { + rc =3D -ENOMEM; + goto out; + } =20 data =3D (struct cifs_open_info_data) { .reparse_point =3D true, .reparse =3D { .tag =3D IO_REPARSE_TAG_SYMLINK, }, - .symlink_target =3D sym, + .symlink_target =3D symlink_target, }; =20 - convert_delimiter(sym, sep); + if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) && symname[0] =3D= =3D '/') { + /* + * This is a request to create an absolute symlink on the server + * which does not support POSIX paths, and expects symlink in + * NT-style path. So convert absolute Linux symlink target path + * to the absolute NT-style path. Root of the NT-style path for + * symlinks is specified in "symlinkroot" mount option. This will + * ensure compatibility of this symlink stored in absolute form + * on the SMB server. + */ + if (!strstarts(symname, cifs_sb->ctx->symlinkroot)) { + /* + * If the absolute Linux symlink target path is not + * inside "symlinkroot" location then there is no way + * to convert such Linux symlink to NT-style path. + */ + cifs_dbg(VFS, + "absolute symlink '%s' cannot be converted to NT format " + "because it is outside of symlinkroot=3D'%s'\n", + symname, cifs_sb->ctx->symlinkroot); + rc =3D -EINVAL; + goto out; + } + len =3D strlen(cifs_sb->ctx->symlinkroot); + if (cifs_sb->ctx->symlinkroot[len-1] !=3D '/') + len++; + if (symname[len] >=3D 'a' && symname[len] <=3D 'z' && + (symname[len+1] =3D=3D '/' || symname[len+1] =3D=3D '\0')) { + /* + * Symlink points to Linux target /symlinkroot/x/path/... + * where 'x' is the lowercase local Windows drive. + * NT-style path for 'x' has common form \??\X:\path\... + * with uppercase local Windows drive. + */ + int common_path_len =3D strlen(symname+len+1)+1; + sym =3D kzalloc(6+common_path_len, GFP_KERNEL); + if (!sym) { + rc =3D -ENOMEM; + goto out; + } + memcpy(sym, "\\??\\", 4); + sym[4] =3D symname[len] - ('a'-'A'); + sym[5] =3D ':'; + memcpy(sym+6, symname+len+1, common_path_len); + } else { + /* Unhandled absolute symlink. Report an error. */ + cifs_dbg( + VFS, + "absolute symlink '%s' cannot be converted to NT format " + "because it points to unknown target\n", + symname); + rc =3D -EINVAL; + goto out; + } + } else { + /* + * This is request to either create an absolute symlink on + * server which expects POSIX paths or it is an request to + * create a relative symlink from the current directory. + * These paths have same format as relative SMB symlinks, + * so no conversion is needed. So just take symname as-is. + */ + sym =3D kstrdup(symname, GFP_KERNEL); + if (!sym) { + rc =3D -ENOMEM; + goto out; + } + } + + if (sep =3D=3D '\\') + convert_delimiter(sym, sep); + + /* + * For absolute NT symlinks it is required to pass also leading + * backslash and to not mangle NT object prefix "\\??\\" and not to + * mangle colon in drive letter. But cifs_convert_path_to_utf16() + * removes leading backslash and replaces '?' and ':'. So temporary + * mask these characters in NT object prefix by '_' and then change + * them back. + */ + if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) && symname[0] =3D= =3D '/') + sym[0] =3D sym[1] =3D sym[2] =3D sym[5] =3D '_'; + path =3D cifs_convert_path_to_utf16(sym, cifs_sb); if (!path) { rc =3D -ENOMEM; goto out; } =20 + if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) && symname[0] =3D= =3D '/') { + sym[0] =3D '\\'; + sym[1] =3D sym[2] =3D '?'; + sym[5] =3D ':'; + path[0] =3D '\\'; + path[1] =3D path[2] =3D '?'; + path[5] =3D ':'; + } + /* * SMB distinguish between symlink to directory and symlink to file. * They cannot be exchanged (symlink of file type which points to @@ -64,8 +159,18 @@ int smb2_create_reparse_symlink(const unsigned int xid,= struct inode *inode, if (rc < 0) goto out; =20 - plen =3D 2 * UniStrnlen((wchar_t *)path, PATH_MAX); - len =3D sizeof(*buf) + plen * 2; + slen =3D 2 * UniStrnlen((wchar_t *)path, PATH_MAX); + poff =3D 0; + plen =3D slen; + if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) && symname[0] =3D= =3D '/') { + /* + * For absolute NT symlinks skip leading "\\??\\" in PrintName as + * PrintName is user visible location in DOS/Win32 format (not in NT for= mat). + */ + poff =3D 4; + plen -=3D 2 * poff; + } + len =3D sizeof(*buf) + plen + slen; buf =3D kzalloc(len, GFP_KERNEL); if (!buf) { rc =3D -ENOMEM; @@ -74,17 +179,17 @@ int smb2_create_reparse_symlink(const unsigned int xid= , struct inode *inode, =20 buf->ReparseTag =3D cpu_to_le32(IO_REPARSE_TAG_SYMLINK); buf->ReparseDataLength =3D cpu_to_le16(len - sizeof(struct reparse_data_b= uffer)); + buf->SubstituteNameOffset =3D cpu_to_le16(plen); - buf->SubstituteNameLength =3D cpu_to_le16(plen); - memcpy(&buf->PathBuffer[plen], path, plen); + buf->SubstituteNameLength =3D cpu_to_le16(slen); + memcpy(&buf->PathBuffer[plen], path, slen); + buf->PrintNameOffset =3D 0; buf->PrintNameLength =3D cpu_to_le16(plen); - memcpy(buf->PathBuffer, path, plen); + memcpy(buf->PathBuffer, path+poff, plen); + buf->Flags =3D cpu_to_le32(*symname !=3D '/' ? SYMLINK_FLAG_RELATIVE : 0); - if (*sym !=3D sep) - buf->Flags =3D cpu_to_le32(SYMLINK_FLAG_RELATIVE); =20 - convert_delimiter(sym, '/'); iov.iov_base =3D buf; iov.iov_len =3D len; new =3D smb2_get_reparse_inode(&data, inode->i_sb, xid, @@ -95,6 +200,7 @@ int smb2_create_reparse_symlink(const unsigned int xid, = struct inode *inode, else rc =3D PTR_ERR(new); out: + kfree(sym); kfree(path); cifs_free_open_info(&data); kfree(buf); @@ -540,6 +646,9 @@ int smb2_parse_native_symlink(char **target, const char= *buf, unsigned int len, char sep =3D CIFS_DIR_SEP(cifs_sb); char *linux_target =3D NULL; char *smb_target =3D NULL; + int symlinkroot_len; + int abs_path_len; + char *abs_path; int levels; int rc; int i; @@ -569,7 +678,123 @@ int smb2_parse_native_symlink(char **target, const ch= ar *buf, unsigned int len, goto out; } =20 - if (smb_target[0] =3D=3D sep && relative) { + if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS) && !relative) { + /* + * This is an absolute symlink from the server which does not + * support POSIX paths, so the symlink is in NT-style path. + * So convert it to absolute Linux symlink target path. Root of + * the NT-style path for symlinks is specified in "symlinkroot" + * mount option. + * + * Root of the DOS and Win32 paths is at NT path \??\ + * It means that DOS/Win32 path C:\folder\file.txt is + * NT path \??\C:\folder\file.txt + * + * NT systems have some well-known object symlinks in their NT + * hierarchy, which is needed to take into account when resolving + * other symlinks. Most commonly used symlink paths are: + * \?? -> \GLOBAL?? + * \DosDevices -> \?? + * \GLOBAL??\GLOBALROOT -> \ + * \GLOBAL??\Global -> \GLOBAL?? + * \GLOBAL??\NUL -> \Device\Null + * \GLOBAL??\UNC -> \Device\Mup + * \GLOBAL??\PhysicalDrive0 -> \Device\Harddisk0\DR0 (for each harddisk) + * \GLOBAL??\A: -> \Device\Floppy0 (if A: is the first floppy) + * \GLOBAL??\C: -> \Device\HarddiskVolume1 (if C: is the first harddisk) + * \GLOBAL??\D: -> \Device\CdRom0 (if D: is first cdrom) + * \SystemRoot -> \Device\Harddisk0\Partition1\WINDOWS (or where is NT s= ystem installed) + * \Volume{...} -> \Device\HarddiskVolume1 (where ... is system generate= d guid) + * + * In most common cases, absolute NT symlinks points to path on + * DOS/Win32 drive letter, system-specific Volume or on UNC share. + * Here are few examples of commonly used absolute NT symlinks + * created by mklink.exe tool: + * \??\C:\folder\file.txt + * \??\\C:\folder\file.txt + * \??\UNC\server\share\file.txt + * \??\\UNC\server\share\file.txt + * \??\Volume{b75e2c83-0000-0000-0000-602f00000000}\folder\file.txt + * + * It means that the most common path prefix \??\ is also NT path + * symlink (to \GLOBAL??). It is less common that second path + * separator is double backslash, but it is valid. + * + * Volume guid is randomly generated by the target system and so + * only the target system knows the mapping between guid and the + * hardisk number. Over SMB it is not possible to resolve this + * mapping, therefore symlinks pointing to target location of + * volume guids are totally unusable over SMB. + * + * For now parse only symlink paths available for DOS and Win32. + * Those are paths with \??\ prefix or paths which points to \??\ + * via other NT symlink (\DosDevices\, \GLOBAL??\, ...). + */ + abs_path =3D smb_target; +globalroot: + if (strstarts(abs_path, "\\??\\")) + abs_path +=3D sizeof("\\??\\")-1; + else if (strstarts(abs_path, "\\DosDevices\\")) + abs_path +=3D sizeof("\\DosDevices\\")-1; + else if (strstarts(abs_path, "\\GLOBAL??\\")) + abs_path +=3D sizeof("\\GLOBAL??\\")-1; + else { + /* Unhandled absolute symlink, points outside of DOS/Win32 */ + cifs_dbg(VFS, + "absolute symlink '%s' cannot be converted from NT format " + "because points to unknown target\n", + smb_target); + rc =3D -EIO; + goto out; + } + + /* Sometimes path separator after \?? is double backslash */ + if (abs_path[0] =3D=3D '\\') + abs_path++; + + while (strstarts(abs_path, "Global\\")) + abs_path +=3D sizeof("Global\\")-1; + + if (strstarts(abs_path, "GLOBALROOT\\")) { + /* Label globalroot requires path with leading '\\', so do not trim '\\= ' */ + abs_path +=3D sizeof("GLOBALROOT")-1; + goto globalroot; + } + + /* For now parse only paths to drive letters */ + if (((abs_path[0] >=3D 'A' && abs_path[0] <=3D 'Z') || + (abs_path[0] >=3D 'a' && abs_path[0] <=3D 'z')) && + abs_path[1] =3D=3D ':' && + (abs_path[2] =3D=3D '\\' || abs_path[2] =3D=3D '\0')) { + /* Convert drive letter to lowercase and drop colon */ + char drive_letter =3D abs_path[0]; + if (drive_letter >=3D 'A' && drive_letter <=3D 'Z') + drive_letter +=3D 'a'-'A'; + abs_path++; + abs_path[0] =3D drive_letter; + } else { + /* Unhandled absolute symlink. Report an error. */ + cifs_dbg(VFS, + "absolute symlink '%s' cannot be converted from NT format " + "because points to unknown target\n", + smb_target); + rc =3D -EIO; + goto out; + } + + abs_path_len =3D strlen(abs_path)+1; + symlinkroot_len =3D strlen(cifs_sb->ctx->symlinkroot); + if (cifs_sb->ctx->symlinkroot[symlinkroot_len-1] =3D=3D '/') + symlinkroot_len--; + linux_target =3D kmalloc(symlinkroot_len + 1 + abs_path_len, GFP_KERNEL); + if (!linux_target) { + rc =3D -ENOMEM; + goto out; + } + memcpy(linux_target, cifs_sb->ctx->symlinkroot, symlinkroot_len); + linux_target[symlinkroot_len] =3D '/'; + memcpy(linux_target + symlinkroot_len + 1, abs_path, abs_path_len); + } else if (smb_target[0] =3D=3D sep && relative) { /* * This is a relative SMB symlink from the top of the share, * which is the top level directory of the Linux mount point. @@ -598,6 +823,12 @@ int smb2_parse_native_symlink(char **target, const cha= r *buf, unsigned int len, } memcpy(linux_target + levels*3, smb_target+1, smb_target_len); /* +1 to = skip leading sep */ } else { + /* + * This is either an absolute symlink in POSIX-style format + * or relative SMB symlink from the current directory. + * These paths have same format as Linux symlinks, so no + * conversion is needed. + */ linux_target =3D smb_target; smb_target =3D NULL; } --=20 2.20.1