diff options
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/namei.c b/fs/namei.c index 94a5e60779f9..d62fdc875f22 100644 --- a/fs/namei.c +++ b/fs/namei.c | |||
| @@ -1736,8 +1736,7 @@ do_last: | |||
| 1736 | if (nd.root.mnt) | 1736 | if (nd.root.mnt) |
| 1737 | path_put(&nd.root); | 1737 | path_put(&nd.root); |
| 1738 | if (!IS_ERR(filp)) { | 1738 | if (!IS_ERR(filp)) { |
| 1739 | error = ima_path_check(&filp->f_path, filp->f_mode & | 1739 | error = ima_file_check(filp, acc_mode); |
| 1740 | (MAY_READ | MAY_WRITE | MAY_EXEC)); | ||
| 1741 | if (error) { | 1740 | if (error) { |
| 1742 | fput(filp); | 1741 | fput(filp); |
| 1743 | filp = ERR_PTR(error); | 1742 | filp = ERR_PTR(error); |
| @@ -1797,8 +1796,7 @@ ok: | |||
| 1797 | } | 1796 | } |
| 1798 | filp = nameidata_to_filp(&nd); | 1797 | filp = nameidata_to_filp(&nd); |
| 1799 | if (!IS_ERR(filp)) { | 1798 | if (!IS_ERR(filp)) { |
| 1800 | error = ima_path_check(&filp->f_path, filp->f_mode & | 1799 | error = ima_file_check(filp, acc_mode); |
| 1801 | (MAY_READ | MAY_WRITE | MAY_EXEC)); | ||
| 1802 | if (error) { | 1800 | if (error) { |
| 1803 | fput(filp); | 1801 | fput(filp); |
| 1804 | filp = ERR_PTR(error); | 1802 | filp = ERR_PTR(error); |