Merge remote-tracking branch 'linus/master' into testing

1 files changed, 5 insertions, 0 deletions

diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 20efd81266c6..449b6cf09b09 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -558,6 +558,11 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info,
                         fattr->cf_mode &= ~(S_IWUGO);
 
                 fattr->cf_nlink = le32_to_cpu(info->NumberOfLinks);
+                if (fattr->cf_nlink < 1) {
+                        cifs_dbg(1, "replacing bogus file nlink value %u\n",
+                                fattr->cf_nlink);
+                        fattr->cf_nlink = 1;
+                }
         }
 
         fattr->cf_uid = cifs_sb->mnt_uid;