The patch titled
nfsd: fix oops on access from high-numbered ports
has been removed from the -mm tree. Its filename was
nfsd-fix-oops-on-access-from-high-numbered-ports.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: nfsd: fix oops on access from high-numbered ports
From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
This bug was always here, but before my commit 6fa02839bf9412e18e77 ("recheck
for secure ports in fh_verify"), it could only be triggered by failure of a
kmalloc(). After that commit it could be triggered by a client making a
request from a non-reserved port for access to an export marked "secure".
(Exports are "secure" by default.)
The result is a struct svc_export with a reference count one to low, resulting
in likely oopses next time the export is accessed.
The reference counting here is not straightforward; a later patch will
clean up fh_verify().
Thanks to Lukas Hejtmanek for the bug report and followup.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Cc: Lukas Hejtmanek <xhejtman@xxxxxxxxxxx>
Cc: Neil Brown <neilb@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/nfsd/nfsfh.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/nfsd/nfsfh.c~nfsd-fix-oops-on-access-from-high-numbered-ports fs/nfsd/nfsfh.c
--- a/fs/nfsd/nfsfh.c~nfsd-fix-oops-on-access-from-high-numbered-ports
+++ a/fs/nfsd/nfsfh.c
@@ -232,6 +232,7 @@ fh_verify(struct svc_rqst *rqstp, struct
fhp->fh_dentry = dentry;
fhp->fh_export = exp;
nfsd_nr_verified++;
+ cache_get(&exp->h);
} else {
/*
* just rechecking permissions
@@ -241,6 +242,7 @@ fh_verify(struct svc_rqst *rqstp, struct
dprintk("nfsd: fh_verify - just checking\n");
dentry = fhp->fh_dentry;
exp = fhp->fh_export;
+ cache_get(&exp->h);
/*
* Set user creds for this exportpoint; necessary even
* in the "just checking" case because this may be a
@@ -252,8 +254,6 @@ fh_verify(struct svc_rqst *rqstp, struct
if (error)
goto out;
}
- cache_get(&exp->h);
-
error = nfsd_mode_check(rqstp, dentry->d_inode->i_mode, type);
if (error)
_
Patches currently in -mm which might be from bfields@xxxxxxxxxxxxxx are
git-nfsd.patch
reiser4.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
