diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 15:43:16 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-09-10 15:43:16 +1000 |
commit | b2febf853d90c2e8d6d4a23a4592b1d3e60bdcf6 (patch) | |
tree | f9f41af5667cd814fd7ee1a8b61ef48ba552b6b5 /fs | |
parent | 10fb29e0e2c8dc41b3b5946df0336938f80c8d1d (diff) | |
parent | a2d61ed525f3458a913147fd02b1a5cf15e7551b (diff) |
Merge remote-tracking branch 'integrity/next'
Conflicts:
fs/nfsd/vfs.c
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namei.c | 2 | ||||
-rw-r--r-- | fs/nfsd/vfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index fec2d2cc3e05..a3a16ad0dcf4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3064,7 +3064,7 @@ opened: error = open_check_o_direct(file); if (error) goto exit_fput; - error = ima_file_check(file, op->acc_mode); + error = ima_file_check(file, op->acc_mode, *opened); if (error) goto exit_fput; diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 965cffd17a0c..989129e2d6ea 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -721,7 +721,7 @@ nfsd_open(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, 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; |