Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 76cc071a06afb4d2dd17bb1b855a233a419e7e02

Authored by Sage Weil
Committed by Al Viro
1 parent 7ce605d93b
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ncpfs: fix rename over directory with dangling references 

ncpfs does not handle references to unlinked directories (or so it would
seem given the ncp_rmdir check).  Since it is also possible to rename over
an empty directory, perform the same check here.

CC: Petr Vandrovec <petr@vandrovec.name>
CC: linux-kernel@vger.kernel.org
Signed-off-by: Sage Weil <sage@newdream.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 9 additions and 1 deletions Side-by-side Diff

... ... @@ -1144,8 +1144,16 @@
1144 1144 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
1145 1145 new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
1146 1146  
1147   - if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode))
  1147 + if (new_dentry->d_inode && S_ISDIR(new_dentry->d_inode->i_mode)) {
  1148 + /*
  1149 + * fail with EBUSY if there are still references to this
  1150 + * directory.
  1151 + */
1148 1152 dentry_unhash(new_dentry);
  1153 + error = -EBUSY;
  1154 + if (!d_unhashed(new_dentry))
  1155 + goto out;
  1156 + }
1149 1157  
1150 1158 ncp_age_dentry(server, old_dentry);
1151 1159 ncp_age_dentry(server, new_dentry);