Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2aeb9d5 authored by Steve French's avatar Steve French
Browse files

[CIFS] Fix oops in cifs_unlink. Caused in some cases when renaming over existing, 


newly created, file.

Samba bugzilla: 2697

Signed-off-by: default avatarSteve French <(sfrench@us.ibm.com)>
parent 67594feb

fs/cifs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -392,7 +392,8 @@ cifs_lookup(struct inode *parent_dir_inode, struct dentry *direntry, struct name 
		rc = 0;

		d_add(direntry, NULL);

	} else {

		cERROR(1,("Error 0x%x or on cifs_get_inode_info in lookup",rc));

		cERROR(1,("Error 0x%x on cifs_get_inode_info in lookup of %s",

			   rc,full_path));

		/* BB special case check for Access Denied - watch security 

		exposure of returning dir info implicitly via different rc 

		if file exists or not but no access BB */

fs/cifs/inode.c

+15 −9
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
			cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR);



	if (!rc) {

		if(direntry->d_inode)

			direntry->d_inode->i_nlink--;

	} else if (rc == -ENOENT) {

		d_drop(direntry);
@@ -440,6 +441,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
					      cifs_sb->mnt_cifs_flags & 

						CIFS_MOUNT_MAP_SPECIAL_CHR);

			CIFSSMBClose(xid, pTcon, netfid);

			if(direntry->d_inode)

				direntry->d_inode->i_nlink--;

		}

	} else if (rc == -EACCES) {
@@ -494,6 +496,7 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
					    cifs_sb->mnt_cifs_flags & 

						CIFS_MOUNT_MAP_SPECIAL_CHR);

			if (!rc) {

				if(direntry->d_inode)

					direntry->d_inode->i_nlink--;

			} else if (rc == -ETXTBSY) {

				int oplock = FALSE;
@@ -514,17 +517,20 @@ int cifs_unlink(struct inode *inode, struct dentry *direntry) 
						cifs_sb->mnt_cifs_flags &

						    CIFS_MOUNT_MAP_SPECIAL_CHR);

					CIFSSMBClose(xid, pTcon, netfid);

					if(direntry->d_inode)

			                        direntry->d_inode->i_nlink--;

				}

			/* BB if rc = -ETXTBUSY goto the rename logic BB */

			}

		}

	}

	if(direntry->d_inode) {

		cifsInode = CIFS_I(direntry->d_inode);

	cifsInode->time = 0;	/* will force revalidate to get info when

				   needed */

	direntry->d_inode->i_ctime = inode->i_ctime = inode->i_mtime =

		current_fs_time(inode->i_sb);

		cifsInode->time = 0;	/* will force revalidate to get info

					   when needed */

		direntry->d_inode->i_ctime = current_fs_time(inode->i_sb);

	}

	inode->i_ctime = inode->i_mtime = current_fs_time(inode->i_sb);

	cifsInode = CIFS_I(inode);

	cifsInode->time = 0;	/* force revalidate of dir as well */