patch-2.2.0-pre8 linux/fs/nfsd/vfs.c

Next file: linux/fs/proc/array.c
Previous file: linux/fs/nfsd/nfsfh.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.2.0-pre7/linux/fs/nfsd/vfs.c linux/fs/nfsd/vfs.c
@@ -282,7 +282,7 @@
 
 	/* Change the attributes. */
 	if (iap->ia_valid) {
-		kernel_cap_t	saved_cap;
+		kernel_cap_t	saved_cap = 0;
 
 		iap->ia_valid |= ATTR_CTIME;
 		iap->ia_ctime = CURRENT_TIME;
@@ -1109,6 +1109,12 @@
 	err = PTR_ERR(rdentry);
 	if (IS_ERR(rdentry))
 		goto out_nfserr;
+
+	if (!rdentry->d_inode) {
+		dput(rdentry);
+		err = nfserr_noent;
+		goto out;
+	}
 
 	if (type != S_IFDIR) {
 		/* It's UNLINK */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov