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

1 files changed, 13 insertions, 3 deletions

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 26910c8154da..4659da67e7f6 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -403,18 +403,24 @@ static int ncp_parse_options(struct ncp_mount_data_kernel *data, char *options)
                 switch (optval) {
                         case 'u':
                                 data->uid = make_kuid(current_user_ns(), optint);
-                                if (!uid_valid(data->uid))
+                                if (!uid_valid(data->uid)) {
+                                        ret = -EINVAL;
                                         goto err;
+                                }
                                 break;
                         case 'g':
                                 data->gid = make_kgid(current_user_ns(), optint);
-                                if (!gid_valid(data->gid))
+                                if (!gid_valid(data->gid)) {
+                                        ret = -EINVAL;
                                         goto err;
+                                }
                                 break;
                         case 'o':
                                 data->mounted_uid = make_kuid(current_user_ns(), optint);
-                                if (!uid_valid(data->mounted_uid))
+                                if (!uid_valid(data->mounted_uid)) {
+                                        ret = -EINVAL;
                                         goto err;
+                                }
                                 break;
                         case 'm':
                                 data->file_mode = optint;
@@ -891,6 +897,10 @@ int ncp_notify_change(struct dentry *dentry, struct iattr *attr)
         if (!server)    /* How this could happen? */
                 goto out;
 
+        result = -EPERM;
+        if (IS_DEADDIR(dentry->d_inode))
+                goto out;
+
         /* ageing the dentry to force validation */
         ncp_age_dentry(server, dentry);