diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-17 10:00:42 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-02-17 10:00:42 +1100 |
| commit | ec144a81ade915b5b38adedf10e84690813ed768 (patch) | |
| tree | c94b53c971ab2c39e27433267318b3c7bc86ff1b /fs/namei.c | |
| parent | b919ee827e048826786fd7e889a2b04f63382fe6 (diff) | |
| parent | 88626272549b94310975932a9970d11a9b362a16 (diff) | |
| download | kernel_samsung_smdk4412-ec144a81ade915b5b38adedf10e84690813ed768.zip kernel_samsung_smdk4412-ec144a81ade915b5b38adedf10e84690813ed768.tar.gz kernel_samsung_smdk4412-ec144a81ade915b5b38adedf10e84690813ed768.tar.bz2 | |
Merge commit 'origin/master' into next
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1736,8 +1736,7 @@ do_last: if (nd.root.mnt) path_put(&nd.root); if (!IS_ERR(filp)) { - error = ima_path_check(&filp->f_path, filp->f_mode & - (MAY_READ | MAY_WRITE | MAY_EXEC)); + error = ima_file_check(filp, acc_mode); if (error) { fput(filp); filp = ERR_PTR(error); @@ -1797,8 +1796,7 @@ ok: } filp = nameidata_to_filp(&nd); if (!IS_ERR(filp)) { - error = ima_path_check(&filp->f_path, filp->f_mode & - (MAY_READ | MAY_WRITE | MAY_EXEC)); + error = ima_file_check(filp, acc_mode); if (error) { fput(filp); filp = ERR_PTR(error); |