nfsd: sanely handle inabilty to fetch pre/post attributes
Subsystems (2)
Jeff Layton
maintainerv3 cover nfsd: sanely handle inabilty to fetch pre/post attributes
Boyang reported tripping the BUG_ON in set_change_info. While we couldn't confirm it, one way this could happen would be for nfsd_lookup to succeed and then for fh_fill_both_attrs to fail.
This patchset attempts to (sanely) fix this, usually by aborting the operation if fetching the pre attributes fails. Post-op attribute fetch handling is more difficult to deal with however since we've already done the operation, so this has it just fudge the change_info4 if that occurs.
---
Changes in v2:
- rework the error paths to consistently use gotos
- add __must_check to fh_fill_pre_attrs and fh_fill_both_attrs
- fix bad error handling in setxattr codepath
---
Jeff Layton (2):
nfsd: handle failure to collect pre/post-op attrs more sanely
nfsd: remove unsafe BUG_ON from set_change_info
fs/nfsd/nfs3proc.c | 4 +++- fs/nfsd/nfs4proc.c | 46 ++++++++++++++++++++++++++++++++++++++++------ fs/nfsd/nfsfh.c | 26 ++++++++++++++++---------- fs/nfsd/nfsfh.h | 6 +++--- fs/nfsd/vfs.c | 52 +++++++++++++++++++++++++++++++++++----------------- fs/nfsd/xdr4.h | 11 ----------- 6 files changed, 97 insertions(+), 48 deletions(-)
---
base-commit: c9194156c1039499533303fc63a66b0f1399896b
change-id: 20230720-bz2223560-9c4690a8217b
Best regards,
Signature · 1 line
Jeff Layton <[email protected]>
Jeff Layton
maintainerPATCH v3 1/2 nfsd: handle failure to collect pre/post-op attrs more sanely
Collecting pre_op_attrs can fail, in which case it's probably best to fail the whole operation.
Change fh_fill_pre_attrs and fh_fill_both_attrs to return __be32, and have the callers check the return code and abort the operation if it's not nfs_ok.
--- fs/nfsd/nfs3proc.c | 4 +++- fs/nfsd/nfs4proc.c | 14 ++++++++------ fs/nfsd/nfsfh.c | 26 ++++++++++++++++---------- fs/nfsd/nfsfh.h | 6 +++--- fs/nfsd/vfs.c | 52 +++++++++++++++++++++++++++++++++++----------------- 5 files changed, 65 insertions(+), 37 deletions(-)
fs/nfsd/nfs3proc.c +3 -1
@@ -307,7 +307,9 @@ nfsd3_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,if (!IS_POSIXACL (inode)) iap->ia_mode &= ~current_umask (); -fh_fill_pre_attrs (fhp); + status =fh_fill_pre_attrs (fhp); +if (status != nfs_ok) + goto out; host_err =vfs_create (&nop_mnt_idmap, inode, child, iap->ia_mode, true);if (host_err <0 ) { status =nfserrno (host_err);
fs/nfsd/nfs4proc.c +8 -6
@@ -297,12 +297,12 @@ nfsd4_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp, }if (d_really_is_positive (child)) { - status = nfs_ok; -/* NFSv4 protocol requires change attributes even though * no change happened. */ -fh_fill_both_attrs (fhp); + status =fh_fill_both_attrs (fhp); +if (status != nfs_ok) + goto out;switch (open->op_createmode) {case NFS4_CREATE_UNCHECKED :
@@ -345,7 +345,9 @@ nfsd4_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,if (!IS_POSIXACL (inode)) iap->ia_mode &= ~current_umask (); -fh_fill_pre_attrs (fhp); + status =fh_fill_pre_attrs (fhp); +if (status != nfs_ok) + goto out; status =nfsd4_vfs_create (fhp, child, open);if (status != nfs_ok) goto out;
@@ -424,11 +426,11 @@ do_open_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, stru }else { status =nfsd_lookup (rqstp, current_fh, open->op_fname, open->op_fnamelen, *resfh); -if (!status) +if (status == nfs_ok)/* NFSv4 protocol requires change attributes even though * no change happened. */ -fh_fill_both_attrs (current_fh); + status =fh_fill_both_attrs (current_fh); }if (status) goto out;
fs/nfsd/nfsfh.c +16 -10
@@ -614,7 +614,7 @@ fh_update(struct svc_fh *fhp)* @fhp: file handle to be updated * */ -void fh_fill_pre_attrs (struct svc_fh *fhp) +__be32 __must_check fh_fill_pre_attrs (struct svc_fh *fhp) {bool v4 = (fhp->fh_maxsize ==NFS4_FHSIZE );struct inode *inode;
@@ -622,12 +622,12 @@ void fh_fill_pre_attrs(struct svc_fh *fhp)__be32 err;if (fhp->fh_no_wcc || fhp->fh_pre_saved) -return ; +return nfs_ok; inode =d_inode (fhp->fh_dentry); err =fh_getattr (fhp, &stat);if (err) -return ; +return err;if (v4) fhp->fh_pre_change =nfsd4_change_attribute (&stat, inode);
@@ -636,6 +636,7 @@ void fh_fill_pre_attrs(struct svc_fh *fhp) fhp->fh_pre_ctime = stat.ctime; fhp->fh_pre_size = stat.size; fhp->fh_pre_saved = true; +return nfs_ok; }/**
@@ -643,26 +644,27 @@ void fh_fill_pre_attrs(struct svc_fh *fhp)* @fhp: file handle to be updated * */ -void fh_fill_post_attrs (struct svc_fh *fhp) +__be32 fh_fill_post_attrs (struct svc_fh *fhp) {bool v4 = (fhp->fh_maxsize ==NFS4_FHSIZE );struct inode *inode =d_inode (fhp->fh_dentry);__be32 err;if (fhp->fh_no_wcc) -return ; +return nfs_ok;if (fhp->fh_post_saved)printk ("nfsd: inode locked twice during operation.\n" ); err =fh_getattr (fhp, &fhp->fh_post_attr);if (err) -return ; +return err; fhp->fh_post_saved = true;if (v4) fhp->fh_post_change =nfsd4_change_attribute (&fhp->fh_post_attr, inode); +return nfs_ok; }/**
@@ -672,16 +674,20 @@ void fh_fill_post_attrs(struct svc_fh *fhp)* This is used when the directory wasn't changed, but wcc attributes * are needed anyway. */ -void fh_fill_both_attrs (struct svc_fh *fhp) +__be32 __must_check fh_fill_both_attrs (struct svc_fh *fhp) { -fh_fill_post_attrs (fhp); -if (!fhp->fh_post_saved) -return ; +__be32 err; + + err =fh_fill_post_attrs (fhp); +if (err) +return err; + fhp->fh_pre_change = fhp->fh_post_change; fhp->fh_pre_mtime = fhp->fh_post_attr.mtime; fhp->fh_pre_ctime = fhp->fh_post_attr.ctime; fhp->fh_pre_size = fhp->fh_post_attr.size; fhp->fh_pre_saved = true; +return nfs_ok; }/*
fs/nfsd/nfsfh.h +3 -3
@@ -294,7 +294,7 @@ static inline void fh_clear_pre_post_attrs(struct svc_fh *fhp) }u64 nfsd4_change_attribute (struct kstat *stat,struct inode *inode); -extern void fh_fill_pre_attrs (struct svc_fh *fhp); -extern void fh_fill_post_attrs (struct svc_fh *fhp); -extern void fh_fill_both_attrs (struct svc_fh *fhp); +__be32 __must_check fh_fill_pre_attrs (struct svc_fh *fhp); +__be32 fh_fill_post_attrs (struct svc_fh *fhp); +__be32 __must_check fh_fill_both_attrs (struct svc_fh *fhp);#endif /* _LINUX_NFSD_NFSFH_H */
fs/nfsd/vfs.c +35 -17
119 lines not on this page · raw message
Signature · 1 line
2.41.0
Jeff Layton
maintainerPATCH v3 2/2 nfsd: remove unsafe BUG_ON from set_change_info
In reply to Jeff LaytonAt one time, nfsd would scrape inode information directly out of struct inode in order to populate the change_info4. At that time, the BUG_ON in set_change_info made some sense, since having it unset meant a coding error.
More recently, it calls vfs_getattr to get this information, which can fail. If that fails, fh_pre_saved can end up not being set. While this situation is unfortunate, we don't need to crash the box.
Move set_change_info to nfs4proc.c since all of the callers are there. Revise the condition for setting "atomic" to also check for fh_pre_saved. Drop the BUG_ON and and just have it zero out both change_attr4s when this occurs.
--- fs/nfsd/nfs4proc.c | 32 ++++++++++++++++++++++++++++++++ fs/nfsd/xdr4.h | 11 ----------- 2 files changed, 32 insertions(+), 11 deletions(-)
fs/nfsd/nfs4proc.c +32 -0
@@ -382,6 +382,38 @@ nfsd4_create_file(struct svc_rqst *rqstp, struct svc_fh *fhp,return status; } +/** +* set_change_info - set up the change_info4 for a reply +* @cinfo: pointer to nfsd4_change_info to be populated +* @fhp: pointer to svc_fh to use as source +* +* Many operations in NFSv4 require change_info4 in the reply. This function +* populates that from the info that we (should!) have already collected. In +* the event that we didn't get any pre-attrs, just zero out both. +*/ +static void +set_change_info (struct nfsd4_change_info *cinfo,struct svc_fh *fhp) +{ + cinfo->atomic = (u32)(fhp->fh_pre_saved && fhp->fh_post_saved && !fhp->fh_no_atomic_attr); + cinfo->before_change = fhp->fh_pre_change; + cinfo->after_change = fhp->fh_post_change; + +/* +* If fetching the pre-change attributes failed, then we should +* have already failed the whole operation. We could have still +* failed to fetch post-change attributes however. +* +* If we didn't get post-op attrs, just zero-out the after +* field since we don't know what it should be. If the pre_saved +* field isn't set for some reason, throw warning and just copy +* whatever is in the after field. +*/ +if (WARN_ON_ONCE (!fhp->fh_pre_saved)) + cinfo->before_change =0 ; +if (!fhp->fh_post_saved) + cinfo->after_change =0 ; +} +static __be32 do_open_lookup (struct svc_rqst *rqstp,struct nfsd4_compound_state *cstate,struct nfsd4_open *open,struct svc_fh **resfh) {
fs/nfsd/xdr4.h +0 -11
@@ -775,17 +775,6 @@ void warn_on_nonidempotent_op(struct nfsd4_op *op);#define NFS4_SVC_XDRSIZE sizeof(struct nfsd4_compoundargs) -static inline void -set_change_info (struct nfsd4_change_info *cinfo,struct svc_fh *fhp) -{ -BUG_ON (!fhp->fh_pre_saved); - cinfo->atomic = (u32)(fhp->fh_post_saved && !fhp->fh_no_atomic_attr); - - cinfo->before_change = fhp->fh_pre_change; - cinfo->after_change = fhp->fh_post_change; -} - -bool nfsd4_mach_creds_match (struct nfs4_client *cl,struct svc_rqst *rqstp);bool nfs4svc_decode_compoundargs (struct svc_rqst *rqstp,struct xdr_stream *xdr);bool nfs4svc_encode_compoundres (struct svc_rqst *rqstp,struct xdr_stream *xdr);
Signature · 1 line
2.41.0
Quoted 11 lines · Jeff Layton
Boyang reported tripping the
BUG_ONinset_change_info. While we couldn't confirm it, one way this could happen would be fornfsd_lookupto succeed and then forfh_fill_both_attrsto fail.This patchset attempts to (sanely) fix this, usually by aborting the operation if fetching the pre attributes fails. Post-op attribute fetch handling is more difficult to deal with however since we've already done the operation, so this has it just fudge the
change_info4if that occurs.Signed-off-by Jeff Layton <[email protected]>
Applied v3 to nfsd-next. Thanks!
Quoted 26 lines
---
Changes in v2:
- rework the error paths to consistently use gotos
- add__must_checktofh_fill_pre_attrsandfh_fill_both_attrs
- fix bad error handling in setxattr codepath---
Jeff Layton (2):
nfsd: handle failure to collect pre/post-op attrs more sanely
nfsd: remove unsafeBUG_ONfromset_change_infofs/nfsd/nfs3proc.c | 4 +++- fs/nfsd/nfs4proc.c | 46 ++++++++++++++++++++++++++++++++++++++++------ fs/nfsd/nfsfh.c | 26 ++++++++++++++++---------- fs/nfsd/nfsfh.h | 6 +++--- fs/nfsd/vfs.c | 52 +++++++++++++++++++++++++++++++++++----------------- fs/nfsd/xdr4.h | 11 ----------- 6 files changed, 97 insertions(+), 48 deletions(-)---
base-commit:c9194156c1039499533303fc63a66b0f1399896b
change-id: 20230720-bz2223560-9c4690a8217bBest regards,
Signature · 1 line
Jeff Layton <[email protected]>