From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mimi Zohar <zohar@linux•vnet.ibm.com>,
Dmitry Kasatkin <d.kasatkin@samsung•com>,
"J. Bruce Fields" <bfields@fieldses•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kinglong Mee <kinglongmee@gmail•com>
Subject: linux-next: manual merge of the integrity tree with the nfsd tree
Date: Mon, 8 Sep 2014 15:12:01 +1000 [thread overview]
Message-ID: <20140908151201.333065c6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1573 bytes --]
Hi all,
Today's linux-next merge of the integrity tree got a conflict in
fs/nfsd/vfs.c between commit 9b638b816081 ("NFSD: Put file after
ima_file_check fail in nfsd_open()") from the nfsd tree and commit
e8442e203c25 ("ima: pass 'opened' flag to identify newly created
files") from the integrity tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc fs/nfsd/vfs.c
index 89d1ae3bcff7,d49c778faecb..000000000000
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@@ -704,25 -704,19 +704,25 @@@ nfsd_open(struct svc_rqst *rqstp, struc
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, 0);
- 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);
++ host_err = ima_file_check(file, may_flags, 0);
+ 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:
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
reply other threads:[~2014-09-08 5:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140908151201.333065c6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bfields@fieldses$(echo .)org \
--cc=d.kasatkin@samsung$(echo .)com \
--cc=kinglongmee@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=zohar@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox