NFSD: Put file after ima_file_check fail in nfsd_open()
Subsystems (2)
PATCH 1/6 NFSD: Put file after ima_file_check fail in nfsd_open()
--- fs/nfsd/vfs.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
fs/nfsd/vfs.c +13 -7
@@ -649,6 +649,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, {struct path path;struct inode *inode; +struct file *file;int flags =O_RDONLY |O_LARGEFILE ;__be32 err;int host_err =0 ;
@@ -703,17 +704,22 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,else flags =O_WRONLY |O_LARGEFILE ; } - *filp =dentry_open (&path, flags,current_cred ()); -if (IS_ERR (*filp)) { - host_err =PTR_ERR (*filp); - *filp =NULL ; + + file =dentry_open (&path, flags,current_cred ()); +if (IS_ERR (file)) { + host_err =PTR_ERR (file); }else { - host_err =ima_file_check (*filp, may_flags); + host_err =ima_file_check (file, may_flags); +if (host_err) { +nfsd_close (file); + goto out_nfserr; + }if (may_flags &NFSD_MAY_64BIT_COOKIE ) - (*filp)->f_mode |=FMODE_64BITHASH ; + (file)->f_mode |=FMODE_64BITHASH ;else - (*filp)->f_mode |=FMODE_32BITHASH ; + (file)->f_mode |=FMODE_32BITHASH ; + *filp = file; } out_nfserr:
Signature · 1 line
1.9.3
fs/nfsd/vfs.c nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, · line 711
Quoted 4 lines
fs/nfsd/vfs.c +3
-0+ file =dentry_open (&path, flags,current_cred ()); +if (IS_ERR (file)) { + host_err =PTR_ERR (file); }else {
The is_err case should have a
goto out_nfserr;
which would allow you to drop the following indentation if you change the whole function anyway.
fs/nfsd/vfs.c nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, · line 721
Quoted 6 lines
fs/nfsd/vfs.c +2
-2if (may_flags &NFSD_MAY_64BIT_COOKIE ) - (*filp)->f_mode |=FMODE_64BITHASH ; + (file)->f_mode |=FMODE_64BITHASH ;else - (*filp)->f_mode |=FMODE_32BITHASH ; + (file)->f_mode |=FMODE_32BITHASH ;
no need for the braces around file here.
PATCH v2 1/1 NFSD: Put file after ima_file_check fail in nfsd_open()
--- fs/nfsd/vfs.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
fs/nfsd/vfs.c +17 -10
@@ -649,6 +649,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, {struct path path;struct inode *inode; +struct file *file;int flags =O_RDONLY |O_LARGEFILE ;__be32 err;int host_err =0 ;
@@ -703,19 +704,25 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type,else flags =O_WRONLY |O_LARGEFILE ; } - *filp =dentry_open (&path, flags,current_cred ()); -if (IS_ERR (*filp)) { - host_err =PTR_ERR (*filp); - *filp =NULL ; - }else { - host_err =ima_file_check (*filp, may_flags); -if (may_flags &NFSD_MAY_64BIT_COOKIE ) - (*filp)->f_mode |=FMODE_64BITHASH ; -else - (*filp)->f_mode |=FMODE_32BITHASH ; + file =dentry_open (&path, flags,current_cred ()); +if (IS_ERR (file)) { + host_err =PTR_ERR (file); + goto out_nfserr; } + host_err =ima_file_check (file, may_flags); +if (host_err) { +nfsd_close (file); + goto out_nfserr; + } + +if (may_flags &NFSD_MAY_64BIT_COOKIE ) + file->f_mode |=FMODE_64BITHASH ; +else + file->f_mode |=FMODE_32BITHASH ; + + *filp = file; out_nfserr: err =nfserrno (host_err); out:
Signature · 1 line
1.9.3
Quoted 12 lines · Christoph Hellwig
fs/nfsd/vfs.c nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, · line 711
Quoted 4 lines
fs/nfsd/vfs.c +3
-0+ file =dentry_open (&path, flags,current_cred ()); +if (IS_ERR (file)) { + host_err =PTR_ERR (file); }else {The
is_errcase should have agoto out_nfserr;which would allow you to drop the following indentation if you change the whole function anyway.
Quoted 9 lines
fs/nfsd/vfs.c nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, · line 721
Quoted 6 lines
fs/nfsd/vfs.c +2
-2if (may_flags &NFSD_MAY_64BIT_COOKIE ) - (*filp)->f_mode |=FMODE_64BITHASH ; + (file)->f_mode |=FMODE_64BITHASH ;else - (*filp)->f_mode |=FMODE_32BITHASH ; + (file)->f_mode |=FMODE_32BITHASH ;no need for the braces around file here.
Thanks for your review.
A new version of this patch has be sent.
thanks,
Kinglong Mee