[CIFS] Fix problem incorrectly closing file during query of reparse points

Commit Message

Steve French Sept. 25, 2014, 7:14 a.m. UTC

[PATCH] Fix problem recognizing symlinks

Changeset eb85d94bd introduced a problem where if a cifs open
fails during query info of a file we
will still try to close the file (happens with certain types
of reparse points) even though the file handle is not valid.

In addition for SMB2/SMB3 we were not mapping the return code returned
by Windows when trying to open a file (like a Windows NFS symlink)
which is a reparse point.

Signed-off-by: Steve French <[e-mail]>
CC: Pavel Shilovsky <[e-mail]>
CC: stable <[e-mail]> #v3.13+

See attached or git tree at
http://git.samba.org/?p=sfrench/cifs-2.6.git;a=shortlog;h=refs/heads/for-next

Comments

Pavel Shilovsky Oct. 2, 2014, 5:01 p.m. UTC | #1

2014-09-25 11:14 GMT+04:00 Steve French <[e-mail]>:
> [PATCH] Fix problem recognizing symlinks
>
> Changeset eb85d94bd introduced a problem where if a cifs open
> fails during query info of a file we
> will still try to close the file (happens with certain types
> of reparse points) even though the file handle is not valid.
>
> In addition for SMB2/SMB3 we were not mapping the return code returned
> by Windows when trying to open a file (like a Windows NFS symlink)
> which is a reparse point.
>
> Signed-off-by: Steve French <[e-mail]>
> CC: Pavel Shilovsky <[e-mail]>
> CC: stable <[e-mail]> #v3.13+
>
> See attached or git tree at
> http://git.samba.org/?p=sfrench/cifs-2.6.git;a=shortlog;h=refs/heads/for-next

Looks correct.

Reviewed-by: Pavel Shilovsky <[e-mail]>

Patch

From 2b20ac4fcd7b9e492a56aa4fd12ebbac830859e7 Mon Sep 17 00:00:00 2001
From: Steve French <[e-mail]>
Date: Thu, 25 Sep 2014 01:26:55 -0500
Subject: [PATCH] Fix problem recognizing symlinks

Changeset eb85d94bd introduced a problem where if a cifs open
fails during query info of a file we
will still try to close the file (happens with certain types
of reparse points) even though the file handle is not valid.

In addition for SMB2/SMB3 we were not mapping the return code returned
by Windows when trying to open a file (like a Windows NFS symlink)
which is a reparse point.

Signed-off-by: Steve French <[e-mail]>
CC: Pavel Shilovsky <[e-mail]>
CC: stable <[e-mail]> #v3.13+
---
 fs/cifs/smb1ops.c      | 2 +-
 fs/cifs/smb2maperror.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
index 8601807..b7d16ef 100644
--- a/fs/cifs/smb1ops.c
+++ b/fs/cifs/smb1ops.c
@@ -586,7 +586,7 @@  cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon,
 		tmprc = CIFS_open(xid, &oparms, &oplock, NULL);
 		if (tmprc == -EOPNOTSUPP)
 			*symlink = true;
-		else
+		else if (rc == 0)
 			CIFSSMBClose(xid, tcon, fid.netfid);
 	}
 
diff --git a/fs/cifs/smb2maperror.c b/fs/cifs/smb2maperror.c
index af59d03..8257a5a 100644
--- a/fs/cifs/smb2maperror.c
+++ b/fs/cifs/smb2maperror.c
@@ -256,6 +256,8 @@  static const struct status_to_posix_error smb2_error_map_table[] = {
 	{STATUS_DLL_MIGHT_BE_INCOMPATIBLE, -EIO,
 	"STATUS_DLL_MIGHT_BE_INCOMPATIBLE"},
 	{STATUS_STOPPED_ON_SYMLINK, -EOPNOTSUPP, "STATUS_STOPPED_ON_SYMLINK"},
+	{STATUS_IO_REPARSE_TAG_NOT_HANDLED, -EOPNOTSUPP,
+	"STATUS_REPARSE_NOT_HANDLED"},
 	{STATUS_DEVICE_REQUIRES_CLEANING, -EIO,
 	"STATUS_DEVICE_REQUIRES_CLEANING"},
 	{STATUS_DEVICE_DOOR_OPEN, -EIO, "STATUS_DEVICE_DOOR_OPEN"},
-- 
1.9.1