diff options
Diffstat (limited to 'security/integrity/ima/ima_main.c')
-rw-r--r-- | security/integrity/ima/ima_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 2df902151193..39d66dc2b8e9 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c | |||
@@ -65,7 +65,7 @@ static void ima_rdwr_violation_check(struct file *file) | |||
65 | goto out; | 65 | goto out; |
66 | } | 66 | } |
67 | 67 | ||
68 | rc = ima_must_measure(NULL, inode, MAY_READ, FILE_CHECK); | 68 | rc = ima_must_measure(inode, MAY_READ, FILE_CHECK); |
69 | if (rc < 0) | 69 | if (rc < 0) |
70 | goto out; | 70 | goto out; |
71 | 71 | ||
@@ -127,7 +127,7 @@ static int process_measurement(struct file *file, const unsigned char *filename, | |||
127 | if (!ima_initialized || !S_ISREG(inode->i_mode)) | 127 | if (!ima_initialized || !S_ISREG(inode->i_mode)) |
128 | return 0; | 128 | return 0; |
129 | 129 | ||
130 | rc = ima_must_measure(NULL, inode, mask, function); | 130 | rc = ima_must_measure(inode, mask, function); |
131 | if (rc != 0) | 131 | if (rc != 0) |
132 | return rc; | 132 | return rc; |
133 | retry: | 133 | retry: |
@@ -141,7 +141,7 @@ retry: | |||
141 | 141 | ||
142 | mutex_lock(&iint->mutex); | 142 | mutex_lock(&iint->mutex); |
143 | 143 | ||
144 | rc = ima_must_measure(iint, inode, mask, function); | 144 | rc = iint->flags & IMA_MEASURED ? 1 : 0; |
145 | if (rc != 0) | 145 | if (rc != 0) |
146 | goto out; | 146 | goto out; |
147 | 147 | ||